Merge branch 'ciiiii:master' into master

chmdir · Feb 22, 2025 · e5d1601 · e5d1601
2 parents f63467d + dfac79d
commit e5d1601
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/stage.yaml b/.github/workflows/stage.yaml
diff --git a/src/index.js b/src/index.js
@@ -117,12 +117,22 @@ async function handleRequest(request) {
   const newReq = new Request(newUrl, {
     method: request.method,
     headers: request.headers,
-    redirect: "follow",
+    // don't follow redirect to dockerhub blob upstream
+    redirect: isDockerHub ? "manual" : "follow",
   });
   const resp = await fetch(newReq);
   if (resp.status == 401) {
     return responseUnauthorized(url);
   }
+  // handle dockerhub blob redirect manually
+  if (isDockerHub && resp.status == 307) {
+    const location = new URL(resp.headers.get("Location"));
+    const redirectResp = await fetch(location.toString(), {
+      method: "GET",
+      redirect: "follow",
+    });
+    return redirectResp;
+  }
   return resp;
 }
 

diff --git a/wrangler.toml b/wrangler.toml
@@ -12,6 +12,7 @@ CUSTOM_DOMAIN = "libcuda.so"
 [env.dev.vars]
 MODE = "debug"
 TARGET_UPSTREAM = "https://registry-1.docker.io"
+CUSTOM_DOMAIN = "exmaple.com"
 
 [env.production]
 name = "cloudflare-docker-proxy"