Add redirect error handling and new IRI dependency.

Author: mdegel

Cargo.lock

@@ -18,6 +18,7 @@ http-body = "1.0.1"
 http-body-util = "0.1.3"
 http-serde = "2.1.1"
 hyper = { version = "1.6.0", features = ["client", "http1"] }
+iri-string = "0.7.9"
 libc = "0.2.174"
 nginx-sys = "0.5.0"
 ngx = { version = "0.5.0", features = ["async", "serde", "std"] }

Cargo.toml

@@ -10,8 +10,9 @@ use std::collections::VecDeque;
 use std::string::{String, ToString};
 
 use bytes::Bytes;
-use error::{NewAccountError, NewCertificateError, RequestError};
+use error::{NewAccountError, NewCertificateError, RedirectError, RequestError};
 use http::Uri;
+use iri_string::types::{UriAbsoluteString, UriReferenceStr};
 use ngx::allocator::{Allocator, Box};
 use ngx::async_::sleep;
 use ngx::collections::Vec;
@@ -185,17 +186,22 @@ where
 
             if res.status().is_redirection() {
                 if let Some(location) = try_get_header(res.headers(), http::header::LOCATION) {
-                    u = Uri::try_from(location).map_err(RequestError::UrlParse)?;
+                    let base = UriAbsoluteString::try_from(u.to_string())
+                        .map_err(RedirectError::InvalidBase)?;
+                    let location_ref =
+                        UriReferenceStr::new(location).map_err(RedirectError::InvalidLocation)?;
+                    let resolved = location_ref.resolve_against(&base).to_string();
+                    u = Uri::try_from(resolved).map_err(RedirectError::InvalidUri)?;
                     continue;
                 } else {
-                    return Err(RequestError::RedirectNoLocation);
+                    return Err(RedirectError::MissingLocation.into());
                 }
             }
 
             return Ok(res);
         }
 
-        Err(RequestError::TooManyRedirects)
+        Err(RedirectError::TooManyRedirects.into())
     }
 
     pub async fn post<P: AsRef<[u8]>>(

src/acme.rs

@@ -114,6 +114,24 @@ impl NewCertificateError {
     }
 }
 
+#[derive(Debug, Error)]
+pub enum RedirectError {
+    #[error("missing Location header")]
+    MissingLocation,
+
+    #[error("too many redirects")]
+    TooManyRedirects,
+
+    #[error("invalid base URI (IRI creation)")]
+    InvalidBase(#[source] iri_string::types::CreationError<std::string::String>),
+
+    #[error("invalid redirect location (IRI validation)")]
+    InvalidLocation(#[source] iri_string::validate::Error),
+
+    #[error("invalid resolved redirect URI")]
+    InvalidUri(#[source] http::uri::InvalidUri),
+}
+
 #[derive(Debug, Error)]
 pub enum RequestError {
     #[error(transparent)]
@@ -146,14 +164,8 @@ pub enum RequestError {
     #[error("cannot sign request body ({0})")]
     Sign(#[from] crate::jws::Error),
 
-    #[error("cannot parse URL ({0})")]
-    UrlParse(#[from] http::uri::InvalidUri),
-
-    #[error("redirect response missing Location header")]
-    RedirectNoLocation,
-
-    #[error("too many redirects")]
-    TooManyRedirects,
+    #[error("redirect failed: {0}")]
+    Redirect(#[from] RedirectError),
 }
 
 impl From<HttpClientError> for RequestError {