redirect url error fixed

Author: ygndotgg

src/handlers/http/oidc.rs

@@ -660,13 +660,10 @@ fn get_canonical_origin() -> Url {
     if let Some(origin_url) = &PARSEABLE.options.domain_address {
         return origin_url.clone();
     }
-    let addr = &PARSEABLE.options.address;
-    // detect http vs https based on TLS cert/key
-    let scheme = PARSEABLE.options.get_scheme();
-    match Url::parse(&format!("{}://{}", scheme, addr)) {
-        Ok(url) => url,
-        Err(_) => Url::parse("http://localhost:8000").unwrap(),
-    }
+    crate::oidc::canonical_local_origin(
+        &PARSEABLE.options.address,
+        PARSEABLE.options.tls_cert_path.is_some() && PARSEABLE.options.tls_key_path.is_some(),
+    )
 }
 
 fn is_valid_redirect_url_safe(canonical: &Url, redirect: &str) -> Result<String, ()> {

src/oidc.rs

@@ -54,10 +54,7 @@ impl OpenidConfig {
         redirect_to: &str,
     ) -> Result<DiscoveredClient, openid::error::Error> {
         let redirect_uri = match self.origin {
-            Origin::Local { socket_addr, https } => {
-                let protocol = if https { "https" } else { "http" };
-                url::Url::parse(&format!("{protocol}://{socket_addr}")).expect("valid url")
-            }
+            Origin::Local { socket_addr, https } => canonical_local_origin(&socket_addr, https),
             Origin::Production(url) => url,
         };
 
@@ -67,6 +64,37 @@ impl OpenidConfig {
     }
 }
 
+pub fn canonical_local_origin(socket_addr: &str, https: bool) -> Url {
+    let scheme = if https { "https" } else { "http" };
+    let mut url = Url::parse(&format!("{scheme}://{socket_addr}"))
+        .unwrap_or_else(|_| Url::parse(&format!("{scheme}://localhost:8000")).unwrap());
+    if matches!(url.host_str(), Some("0.0.0.0") | Some("::")) {
+        url.set_host(Some("localhost")).expect("localhost is valid");
+    }
+    url
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn wildcard_ipv4_origin_uses_localhost_with_configured_port() {
+        assert_eq!(
+            canonical_local_origin("0.0.0.0:8000", false).as_str(),
+            "http://localhost:8000/"
+        );
+    }
+
+    #[test]
+    fn loopback_ipv4_origin_is_preserved() {
+        assert_eq!(
+            canonical_local_origin("127.0.0.1:9000", false).as_str(),
+            "http://127.0.0.1:9000/"
+        );
+    }
+}
+
 #[derive(Debug, serde::Serialize, serde::Deserialize, Clone)]
 pub struct Claims {
     #[serde(flatten)]