Fix

DaoCloud · Dec 26, 2024 · cf2068f · cf2068f
1 parent 6efcbf7
commit cf2068f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/crproxy_blob.go b/crproxy_blob.go
@@ -126,6 +126,7 @@ func (c *CRProxy) cacheBlobResponse(rw http.ResponseWriter, r *http.Request, inf
 }
 
 func (c *CRProxy) cacheBlobContent(ctx context.Context, r *http.Request, blobPath string, info *PathInfo) (int64, error) {
+	r.Method = http.MethodGet
 	cli := c.getClientset(info.Host, info.Image)
 	resp, err := c.doWithAuth(cli, r.WithContext(ctx), info.Host)
 	if err != nil {
@@ -140,7 +141,31 @@ func (c *CRProxy) cacheBlobContent(ctx context.Context, r *http.Request, blobPat
 		return 0, errcode.ErrorCodeDenied
 	}
 
-	if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {
+	if resp.StatusCode < http.StatusOK {
+		if c.logger != nil {
+			c.logger.Println("origin blob response 1xx", info.Host, info.Image, resp.StatusCode, dumpResponse(resp))
+		}
+		return 0, errcode.ErrorCodeUnknown.WithMessage(fmt.Sprintf("Source response code %d", resp.StatusCode))
+	}
+
+	if resp.StatusCode >= http.StatusMultipleChoices && resp.StatusCode < http.StatusBadRequest {
+		if c.logger != nil {
+			c.logger.Println("origin blob response 3xx", info.Host, info.Image, resp.StatusCode, dumpResponse(resp))
+		}
+		return 0, errcode.ErrorCodeUnknown.WithMessage(fmt.Sprintf("Source response code %d", resp.StatusCode))
+	}
+
+	if resp.StatusCode >= http.StatusBadRequest && resp.StatusCode < http.StatusInternalServerError {
+		if c.logger != nil {
+			c.logger.Println("origin blob response 4xx", info.Host, info.Image, resp.StatusCode, dumpResponse(resp))
+		}
+		return 0, errcode.ErrorCodeUnknown.WithMessage(fmt.Sprintf("Source response code %d", resp.StatusCode))
+	}
+
+	if resp.StatusCode >= http.StatusInternalServerError {
+		if c.logger != nil {
+			c.logger.Println("origin blob response 5xx", info.Host, info.Image, resp.StatusCode, dumpResponse(resp))
+		}
 		return 0, errcode.ErrorCodeUnknown.WithMessage(fmt.Sprintf("Source response code %d", resp.StatusCode))
 	}
 

diff --git a/crproxy_manifest.go b/crproxy_manifest.go
@@ -70,7 +70,7 @@ func (c *CRProxy) cacheManifestResponse(rw http.ResponseWriter, r *http.Request,
 			return
 		}
 		if c.logger != nil {
-			c.logger.Println("origin manifest response 4xx", info.Host, info.Image, err, dumpResponse(resp))
+			c.logger.Println("origin manifest response 4xx", info.Host, info.Image)
 		}
 	} else if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusInternalServerError {
 		if c.fallbackServeCachedManifest(rw, r, info) {
@@ -80,7 +80,7 @@ func (c *CRProxy) cacheManifestResponse(rw http.ResponseWriter, r *http.Request,
 			return
 		}
 		if c.logger != nil {
-			c.logger.Println("origin manifest response 5xx", info.Host, info.Image, err, dumpResponse(resp))
+			c.logger.Println("origin manifest response 5xx", info.Host, info.Image)
 		}
 	}
 

diff --git a/utils.go b/utils.go
@@ -162,6 +162,6 @@ func isDomainName(s string) bool {
 }
 
 func dumpResponse(resp *http.Response) string {
-	body, _ := io.ReadAll(io.LimitReader(resp.Body, 100))
+	body, _ := io.ReadAll(io.LimitReader(resp.Body, 1000))
 	return fmt.Sprintf("%d %d %q", resp.StatusCode, resp.ContentLength, string(body))
 }