Merge pull request #59 from dunglas/fix/prefer

fix: the Prefer header wasn't property read from the request
dunglas · Sep 15, 2020 · cc42708 · cc42708
2 parents 656e75c + cd24b84
commit cc42708
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 27 deletions.
diff --git a/gateway/gateway.go b/gateway/gateway.go
@@ -83,13 +83,13 @@ func (g *Gateway) getOpenAPIRoute(url *url.URL, route *openapi3filter.Route, rou
 	return g.openAPI.getRoute(url)
 }
 
-func canParse(resp *http.Response, fields, preload httpsfv.List) bool {
+func canParse(resp *http.Response, req *http.Request, fields, preload httpsfv.List) bool {
 	if (len(fields) == 0 && len(preload) == 0) || !jsonRe.MatchString(resp.Header.Get("Content-Type")) {
 		// No Vulcain hints, or not JSON: don't modify the response
 		return false
 	}
 
-	prefers, ok := resp.Header["Prefer"]
+	prefers, ok := req.Header["Prefer"]
 	if !ok {
 		return true
 	}
@@ -109,7 +109,7 @@ func (g *Gateway) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	rp := httputil.NewSingleHostReverseProxy(g.options.Upstream)
 	rp.ModifyResponse = func(resp *http.Response) error {
 		fields, preload, fieldsHeader, fieldsQuery, preloadHeader, preloadQuery := extractFromRequest(req)
-		if !canParse(resp, fields, preload) {
+		if !canParse(resp, req, fields, preload) {
 			g.cleanupAfterRequest(pusher, explicitRequestID, explicitRequest, false)
 			return nil
 		}

diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
@@ -138,28 +138,44 @@ func TestParseRelation(t *testing.T) {
 }
 
 func TestCanParse(t *testing.T) {
-	r := &http.Response{Header: http.Header{"Content-Type": []string{"text/xml"}}}
-
-	assert.False(t, canParse(r, httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{}))
-
-	r = &http.Response{Header: http.Header{"Content-Type": []string{"application/json"}}}
-	assert.False(t, canParse(r, httpsfv.List{}, httpsfv.List{}))
-
-	r = &http.Response{Header: http.Header{
-		"Content-Type": []string{"application/json"},
-		"Prefer":       []string{"selector=css"},
-	}}
-	assert.False(t, canParse(r, httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{}))
-
-	r = &http.Response{Header: http.Header{
-		"Content-Type": []string{"application/json"},
-		"Prefer":       []string{"selector=json-pointer"},
-	}}
-	assert.True(t, canParse(r, httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{}))
-
-	r = &http.Response{Header: http.Header{"Content-Type": []string{"application/ld+json"}}}
-	assert.True(t, canParse(r, httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{}))
-
-	r = &http.Response{Header: http.Header{"Content-Type": []string{"application/ld+json"}}}
-	assert.True(t, canParse(r, httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{}))
+	assert.False(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"text/xml"}}},
+		&http.Request{},
+		httpsfv.List{httpsfv.NewItem("foo")}, httpsfv.List{},
+	))
+
+	assert.False(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"application/json"}}},
+		&http.Request{},
+		httpsfv.List{},
+		httpsfv.List{},
+	))
+
+	assert.False(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"application/json"}}},
+		&http.Request{Header: http.Header{"Prefer": []string{"selector=css"}}},
+		httpsfv.List{httpsfv.NewItem("foo")},
+		httpsfv.List{},
+	))
+
+	assert.True(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"application/json"}}},
+		&http.Request{Header: http.Header{"Prefer": []string{"selector=json-pointer"}}},
+		httpsfv.List{httpsfv.NewItem("foo")},
+		httpsfv.List{},
+	))
+
+	assert.True(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"application/ld+json"}}},
+		&http.Request{},
+		httpsfv.List{httpsfv.NewItem("foo")},
+		httpsfv.List{},
+	))
+
+	assert.True(t, canParse(
+		&http.Response{Header: http.Header{"Content-Type": []string{"application/ld+json"}}},
+		&http.Request{},
+		httpsfv.List{httpsfv.NewItem("foo")},
+		httpsfv.List{},
+	))
 }