please the tests

src/routing/domain.rs

@@ -252,9 +252,12 @@ impl DomainResolver {
         }
 
         // Check if it's a raw domain
-        let raw = depth == 2 && host.labels().nth(1) == Some("raw");
+        let raw = depth == 2;
+        if raw && host.labels().nth(1) != Some("raw") {
+            return None;
+        }
 
-        // Attempt to extract canister_id
+        // Strip the optional prefix if any
         let label = host.labels().next()?.split("--").last()?;
 
         // Do not allow cases like <id>.foo.ic0.app where
@@ -505,24 +508,9 @@ mod test {
             })
         );
 
-        // Nested subdomain should not match canister id
-        // TODO discuss?
-        assert_eq!(
-            resolver.resolve(&fqdn!("aaaaa-aa.foo.ic0.app")),
-            Some(DomainLookup {
-                domain: domain_ic0_app.clone(),
-                canister_id: None,
-                verify: true,
-            })
-        );
-        assert_eq!(
-            resolver.resolve(&fqdn!("aaaaa-aa.foo.icp0.io")),
-            Some(DomainLookup {
-                domain: domain_icp0_io.clone(),
-                canister_id: None,
-                verify: true,
-            })
-        );
+        // 2-level non-raw subdomain should not resolve
+        assert_eq!(resolver.resolve(&fqdn!("aaaaa-aa.foo.ic0.app")), None);
+        assert_eq!(resolver.resolve(&fqdn!("aaaaa-aa.foo.icp0.io")), None,);
 
         // Resolve custom domain
         assert_eq!(

src/routing/handler.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use axum::{
     extract::{Request, State},
-    response::{IntoResponse, Response},
+    response::Response,
     Extension,
 };
 use bytes::Bytes;
@@ -66,7 +66,7 @@ pub async fn handler(
     };
 
     // Pass headers in/out the IC request
-    let mut resp = PASS_HEADERS
+    let resp = PASS_HEADERS
         .scope(PassHeaders::new(), async {
             PASS_HEADERS.with(|x| {
                 let hdr =
@@ -85,15 +85,7 @@ pub async fn handler(
                 req
             };
 
-            let res = req.send().await;
-
-            PASS_HEADERS.with(|x| {
-                for (k, v) in &x.borrow().headers_in {
-                    println!("{k:?}: {v:?}");
-                }
-            });
-
-            res
+            req.send().await
         })
         .await
         .map_err(ErrorCause::from_err)?;

src/routing/mod.rs

@@ -281,16 +281,18 @@ pub fn setup_router(
                     return router_health.oneshot(request).await;
                 }
 
-                // Redirect to the dashboard if the request is to the root of domain
-                // and no canister was resolved
-                if path == "/" && ctx.canister_id.is_none() {
+                // Redirect to the dashboard if the request is to the root of the base domain
+                // or to a bare "raw" subdomain w/o canister id.
+                if path == "/"
+                    && (ctx.is_base_domain() || ctx.authority.labels().next() == Some("raw"))
+                {
                     return Ok(
                         Redirect::temporary("https://dashboard.internetcomputer.org/")
                             .into_response(),
                     );
                 }
 
-                // Otherwise request goes to the canister
+                // Otherwise request goes to the HTTP->IC handler
                 router_http.oneshot(request).await
             },
         )