Adapt to new SetHeaders prototype

openshift · Oct 12, 2020 · bb8ea9f · bb8ea9f
1 parent b097b99
commit bb8ea9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/dockerregistry/server/auth.go b/pkg/dockerregistry/server/auth.go
@@ -110,7 +110,7 @@ func (ac *authChallenge) Error() string {
 }
 
 // SetHeaders sets the basic challenge header on the response.
-func (ac *authChallenge) SetHeaders(w http.ResponseWriter) {
+func (ac *authChallenge) SetHeaders(req *http.Request, w http.ResponseWriter) {
 	// WWW-Authenticate response challenge header.
 	// See https://tools.ietf.org/html/rfc6750#section-3
 	str := fmt.Sprintf("Basic realm=%s", ac.realm)
@@ -126,7 +126,7 @@ func (ac *tokenAuthChallenge) Error() string {
 }
 
 // SetHeaders sets the bearer challenge header on the response.
-func (ac *tokenAuthChallenge) SetHeaders(w http.ResponseWriter) {
+func (ac *tokenAuthChallenge) SetHeaders(req *http.Request, w http.ResponseWriter) {
 	// WWW-Authenticate response challenge header.
 	// See https://docs.docker.com/registry/spec/auth/token/#/how-to-authenticate and https://tools.ietf.org/html/rfc6750#section-3
 	str := fmt.Sprintf("Bearer realm=%q", ac.realm)

diff --git a/pkg/dockerregistry/server/auth_test.go b/pkg/dockerregistry/server/auth_test.go
@@ -481,7 +481,7 @@ func TestAccessController(t *testing.T) {
 				}
 				if isChallenge {
 					recorder := httptest.NewRecorder()
-					challengeErr.SetHeaders(recorder)
+					challengeErr.SetHeaders(req, recorder)
 					if !reflect.DeepEqual(recorder.HeaderMap, test.expectedHeaders) {
 						t.Fatalf("expected headers %#v, got %#v", test.expectedHeaders, recorder.HeaderMap)
 					}