Merge pull request #497 from ipfs/fix/gw-error-content-block

lidel · web-flow · commit 341c7da1fd28 · 2023-10-28T04:57:42.000+02:00
fix(gw): blocked content produces http error 410
diff --git a/gateway/errors.go b/gateway/errors.go
@@ -149,6 +149,8 @@ func webError(w http.ResponseWriter, r *http.Request, c *Config, err error, defa
 		code = http.StatusBadRequest
 	case isErrNotFound(err):
 		code = http.StatusNotFound
+	case isErrContentBlocked(err):
+		code = http.StatusGone
 	case errors.Is(err, context.DeadlineExceeded):
 		code = http.StatusGatewayTimeout
 	}
@@ -202,3 +204,10 @@ func isErrNotFound(err error) bool {
 		}
 	}
 }
+
+// isErrContentBlocked returns true for content filtering system errors
+func isErrContentBlocked(err error) bool {
+	// TODO: we match error message to avoid pulling nopfs as a dependency
+	// Ref. https://github.com/ipfs-shipyard/nopfs/blob/cde3b5ba964c13e977f4a95f3bd8ca7d7710fbda/status.go#L87-L89
+	return strings.Contains(err.Error(), "blocked and cannot be provided")
+}

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ func webError(w http.ResponseWriter, r http.Request, c Config, err error, defa`
`149`	`149`	`code = http.StatusBadRequest`
`150`	`150`	`case isErrNotFound(err):`
`151`	`151`	`code = http.StatusNotFound`
	`152`	`+ case isErrContentBlocked(err):`
	`153`	`+ code = http.StatusGone`
`152`	`154`	`case errors.Is(err, context.DeadlineExceeded):`
`153`	`155`	`code = http.StatusGatewayTimeout`
`154`	`156`	`}`
`@@ -202,3 +204,10 @@ func isErrNotFound(err error) bool {`
`202`	`204`	`}`
`203`	`205`	`}`
`204`	`206`	`}`
	`207`	`+`
	`208`	`+// isErrContentBlocked returns true for content filtering system errors`
	`209`	`+func isErrContentBlocked(err error) bool {`
	`210`	`+ // TODO: we match error message to avoid pulling nopfs as a dependency`
	`211`	`+ // Ref. https://github.com/ipfs-shipyard/nopfs/blob/cde3b5ba964c13e977f4a95f3bd8ca7d7710fbda/status.go#L87-L89`
	`212`	`+ return strings.Contains(err.Error(), "blocked and cannot be provided")`
	`213`	`+}`