support subdomain & path gateways for fetching

n0-computer · Oct 24, 2022 · 23d3a0d · fabricedesre · Oct 24, 2022 · 23d3a0d
1 parent 21976ab
commit 23d3a0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/iroh-gateway/src/config.rs b/iroh-gateway/src/config.rs
@@ -29,6 +29,9 @@ pub struct Config {
     /// flag to toggle whether the gateway should use denylist on requests
     pub use_denylist: bool,
     /// URL of gateways to be used by the racing resolver.
+    /// strings can either be urls or subdomain gateway roots
+    /// values without https:// prefix are treated as subdomain gateways (eg: dweb.link)
+    /// values with are treated as IPFS path gateways (eg: https://ipfs.io)
     pub http_resolvers: Option<Vec<String>>,
     /// rpc addresses for the gateway & addresses for the rpc client to dial
     pub rpc_client: RpcClientConfig,
@@ -208,7 +211,10 @@ mod tests {
             Value::new(None, default.public_url_base.clone()),
         );
         expect.insert("port".to_string(), Value::new(None, default.port as i64));
-        expect.insert("denylist".to_string(), Value::new(None, default.denylist));
+        expect.insert(
+            "use_denylist".to_string(),
+            Value::new(None, default.denylist),
+        );
         expect.insert(
             "headers".to_string(),
             Value::new(None, collect_headers(&default.headers).unwrap()),

diff --git a/iroh-resolver/src/racing.rs b/iroh-resolver/src/racing.rs
@@ -50,8 +50,10 @@ impl RacingLoader {
     async fn fetch_http(&self, cid: &Cid) -> Result<(Bytes, String), anyhow::Error> {
         let gateway = self.try_raw_gateway()?;
         let cid_str = multibase::encode(multibase::Base::Base32Lower, cid.to_bytes().as_slice());
-        // let gateway_url = format!("https://{}.ipfs.{}?format=raw", cid_str, gateway);
-        let gateway_url = format!("{}/ipfs/{}?format=raw", gateway, cid_str);
+        let mut gateway_url = format!("https://{}.ipfs.{}?format=raw", cid_str, gateway);
+        if gateway.starts_with("https://") || gateway.starts_with("http://") {
+            gateway_url = format!("{}/ipfs/{}?format=raw", gateway, cid_str);
+        }
         debug!("Will fetch {}", gateway_url);
         let response = reqwest::get(gateway_url).await?;
         response