src/client/mod.rs

@@ -49,55 +49,19 @@ impl Client {
 }
 
 impl Client {
-    /// Perform a Gemini request with the specified URL.
+    /// Parse the given URL, do some checks,
-    /// Host and port (1965 by default) are parsed from `url_str`
+    /// take host and port (default is 1965) from the URL
-    /// after scheme and userinfo checks.
+    /// and perform a Gemini request, returning [`Response`] on success.
-    /// On success, [`Response`] is returned.
-    ///
-    /// Automatically follows redirections up to 5 times.
-    /// To avoid this behavior, use [`Client::request_with_no_redirect`],
-    /// this function is also called here under the hood.
-    ///
-    /// Returns an error if a scheme is not `gemini://` or
-    /// a userinfo portion (`user:password@`) is present in the URL.
-    /// To avoid this checks, most probably for proxying requests,
-    /// use [`Client::request_with_host`].
-    ///
-    /// # Errors
-    /// - See [`Client::request_with_no_redirect`].
-    pub async fn request(&self, url_str: &str) -> Result<ThisResponse, LibError> {
-        // first request
-        let mut resp = self.request_with_no_redirect(url_str).await?;
-
-        let mut i: u8 = 0;
-        const MAX: u8 = 5;
-
-        // repeat requests until we get a non-30 status
-        // or hit the redirection depth limit
-        loop {
-            if resp.status().reply_type() == ReplyType::Redirect && i < MAX {
-                resp = self.request_with_no_redirect(resp.message()).await?;
-                i += 1;
-                continue;
-            }
-            return Ok(resp);
-        }
-    }
-
-    /// Perform a Gemini request with the specified URL
-    /// **without** following redirections.
-    /// Host and port (1965 by default) are parsed from `url_str`
-    /// after scheme and userinfo checks.
-    /// On success, [`Response`] is returned.
     ///
     /// # Errors
+    /// Everything is converted into [`LibError`].
     /// - [`InvalidUrl::ParseError`] means that the given URL cannot be parsed.
-    /// - [`InvalidUrl::SchemeNotGemini`] is returned when a scheme is not `gemini://`,
+    /// - [`InvalidUrl::SchemeNotGemini`] is returned when the scheme is not `gemini://`
-    ///   for proxying requests use [`Client::request_with_host`].
+    ///   (for proxying use [`Client::request_with_host`]).
-    /// - [`InvalidUrl::UserinfoPresent`] is returned when the given URL contains
+    /// - [`InvalidUrl::UserinfoPresent`] is returned when the URL contains userinfo -- `user:password@` --
-    ///   a userinfo portion (`user:password@`) -- it is forbidden by the Gemini specification.
+    ///   which is forbidden by the Gemini specs.
-    /// - See [`Client::request_with_host`] for the rest.
+    /// - For the rest, see [`Client::request_with_host`].
-    pub async fn request_with_no_redirect(&self, url_str: &str) -> Result<ThisResponse, LibError> {
+    pub async fn request(&self, url_str: &str) -> Result<ThisResponse, LibError> {
         let url = Url::parse(url_str).map_err(InvalidUrl::ParseError)?;
         // deny non-Gemini requests
         if url.scheme() != "gemini" {
@@ -118,22 +82,17 @@ impl Client {
     /// Non-`gemini://` URLs is OK if the remote server supports proxying.
     ///
     /// # Errors
-    /// - [`InvalidUrl::ConvertError`] means that a hostname cannot be
+    /// Everything is converted into [`LibError`].
-    ///   converted into [`pki_types::ServerName`].
+    /// - [`InvalidUrl::ConvertError`] is an error while converting
-    /// - [`LibError::HostLookupError`] means that a DNS server returned no records,
+    ///   host and port into [`std::net::SocketAddr`] or [`pki_types::ServerName`].
-    ///   i.&nbsp;e. that domain does not exist.
+    /// - [`std::io::Error`] is returned in nearly all cases:
-    /// - [`LibError::DnsClientError`] (crate feature `hickory`)
-    ///   wraps a Hickory DNS client error related to a connection failure
-    ///   or an invalid DNS server response.
-    /// - [`std::io::Error`] is returned in many cases:
     ///   could not open a TCP connection, perform a TLS handshake,
     ///   write to or read from the TCP stream.
-    ///   Check the ErrorKind and/or the inner error
+    ///   Check the inner error if you need to determine what exactly happened.
-    ///   if you need to determine what exactly happened.
+    /// - [`LibError::StatusOutOfRange`] means that a server returned an incorrect status code
-    /// - [`LibError::StatusOutOfRange`] means that a Gemini server returned
+    ///   (less than 10 or greater than 69).
-    ///   an invalid status code (less than 10 or greater than 69).
     /// - [`LibError::DataNotUtf8`] is returned when metadata (the text after a status code)
-    ///   is not in UTF-8 and cannot be converted to a string without errors.
+    ///   is not in UTF-8 and cannot be converted to string without errors.
     pub async fn request_with_host(
         &self,
         url_str: &str,

src/client/tests/mod.rs

@@ -1,7 +1,5 @@
 use tokio::runtime::Runtime;
 
-use crate::certs::{fingerprint::CertFingerprint, CertificateDer};
-
 use super::*;
 
 #[test]
@@ -42,43 +40,3 @@ fn check_parser() {
     drop(resp); // to free recv from mutable borrowing
     assert_eq!(recv.as_slice(), b"gemini://unw.dc09.ru\r\n");
 }
-
-#[test]
-fn check_real_site() {
-    let rt = Runtime::new().unwrap();
-    let client = Client::builder()
-        .with_selfsigned_cert_verifier(Verifier {})
-        .build();
-
-    let resp = rt
-        .block_on(client.request("gemini://geminiprotocol.net/docs"))
-        .unwrap();
-
-    assert_eq!(resp.is_ok(), true); // check if redirection is processed correctly
-
-    {
-        let mime = resp.mime().unwrap();
-        assert_eq!(mime.type_(), mime::TEXT);
-        assert_eq!(mime.subtype(), "gemini");
-    }
-
-    struct Verifier;
-
-    #[async_trait::async_trait]
-    impl SelfsignedCertVerifier for Verifier {
-        async fn verify(
-            &self,
-            cert: &CertificateDer<'_>,
-            host: &str,
-            port: u16,
-        ) -> Result<bool, LibError> {
-            assert_eq!(host, "geminiprotocol.net");
-            assert_eq!(port, 1965);
-            assert_eq!(
-                CertFingerprint::new_sha256(cert).base64(),
-                "OBuOKRLSTQcgHXdQ0QFshcGQSgc5o+g0fnHDY+7SolE",
-            );
-            Ok(true)
-        }
-    }
-}