From 3970616451ab4336e37a7ddfdc67f51e01e55926 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sun, 24 Mar 2024 14:24:20 +0000 Subject: refactor: module for blocking, default to non-blocking --- src/request.rs | 52 ++++++++-------------------------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) (limited to 'src/request.rs') diff --git a/src/request.rs b/src/request.rs index 97aa954..f1eb005 100644 --- a/src/request.rs +++ b/src/request.rs @@ -1,5 +1,5 @@ // This file is part of Germ . -// Copyright (C) 2022-2022 Fuwn +// Copyright (C) 2022-2023 Fuwn // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -22,50 +22,14 @@ mod response; mod status; mod verifier; -#[cfg(feature = "sync")] pub mod sync; +#[cfg(feature = "blocking")] +pub mod blocking; + +#[cfg(feature = "request")] +pub mod non_blocking; -use std::io::{Read, Write}; +#[cfg(feature = "request")] +pub use non_blocking::request; pub(crate) use verifier::GermVerifier; pub use {response::Response, status::Status}; - -/// Make a request to a Gemini server. The `url` **should** be prefixed with a -/// scheme (e.g. "gemini://"). -/// -/// # Example -/// -/// ```rust -/// match germ::request::request(&url::Url::parse("gemini://fuwn.me").unwrap()) { -/// Ok(response) => println!("{:?}", response), -/// Err(_) => {} -/// } -/// ``` -/// -/// # Errors -/// - May error if the URL is invalid -/// - May error if the TLS write fails -/// - May error if the TLS read fails -pub fn request(url: &url::Url) -> anyhow::Result { - let config = rustls::ClientConfig::builder() - .with_safe_defaults() - .with_custom_certificate_verifier(std::sync::Arc::new(GermVerifier::new())) - .with_no_client_auth(); - let mut connection = rustls::ClientConnection::new( - std::sync::Arc::new(config), - url.domain().unwrap_or("").try_into()?, - )?; - let mut stream = std::net::TcpStream::connect(format!( - "{}:{}", - url.domain().unwrap_or(""), - url.port().unwrap_or(1965) - ))?; - let mut tls = rustls::Stream::new(&mut connection, &mut stream); - - tls.write_all(format!("{url}\r\n").as_bytes())?; - - let mut plain_text = Vec::new(); - - tls.read_to_end(&mut plain_text)?; - - Ok(Response::new(&plain_text, tls.conn.negotiated_cipher_suite())) -} -- cgit v1.2.3