fix(gateway): allow CAR trustless requests with path

ipfs · Jun 19, 2023 · 4530557 · 4530557
1 parent abc4d0c
commit 4530557
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
@@ -676,8 +676,9 @@ func TestIpfsTrustlessMode(t *testing.T) {
 	trustlessTests := func(t *testing.T, host string) {
 		doIpfsCidRequests(t, trustlessFormats, host, http.StatusOK)
 		doIpfsCidRequests(t, trustedFormats, host, http.StatusNotAcceptable)
-		doIpfsCidPathRequests(t, trustlessFormats, host, http.StatusNotAcceptable)
 		doIpfsCidPathRequests(t, trustedFormats, host, http.StatusNotAcceptable)
+		doIpfsCidPathRequests(t, []string{"raw"}, host, http.StatusNotAcceptable)
+		doIpfsCidPathRequests(t, []string{"car"}, host, http.StatusOK)
 	}
 
 	t.Run("Explicit Trustless Gateway", func(t *testing.T) {

diff --git a/gateway/handler.go b/gateway/handler.go
@@ -331,7 +331,7 @@ func (i *handler) isTrustlessRequest(contentPath ipath.Path, responseFormat stri
 	// Only allow "/{#1}/{#2}"-like paths.
 	trimmedPath := strings.Trim(contentPath.String(), "/")
 	pathComponents := strings.Split(trimmedPath, "/")
-	if len(pathComponents) != 2 {
+	if responseFormat != carResponseFormat && len(pathComponents) != 2 {
 		return false
 	}