use upstream authentication filter

openshift · Sep 1, 2017 · dbd79a7 · dbd79a7
1 parent 98c26b3
commit dbd79a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/pkg/cmd/server/handlers/authentication.go b/pkg/cmd/server/handlers/authentication.go
diff --git a/pkg/cmd/server/origin/controller/standalone_apiserver.go b/pkg/cmd/server/origin/controller/standalone_apiserver.go
@@ -62,7 +62,7 @@ func RunControllerServer(servingInfo configapi.HTTPServingInfo, kubeExternal cli
 	// we use direct bypass to allow readiness and health to work regardless of the master health
 	authz := serverhandlers.NewBypassAuthorizer(remoteAuthz, "/healthz", "/healthz/ready")
 	handler := serverhandlers.AuthorizationFilter(mux, authz, authorizationAttributeBuilder, requestContextMapper)
-	handler = serverhandlers.AuthenticationHandlerFilter(handler, authn, requestContextMapper)
+	handler = apifilters.WithAuthentication(handler, requestContextMapper, authn, apifilters.Unauthorized(false))
 	handler = apiserverfilters.WithPanicRecovery(handler)
 	handler = apifilters.WithRequestInfo(handler, requestInfoResolver, requestContextMapper)
 	handler = apirequest.WithRequestContext(handler, requestContextMapper)

diff --git a/pkg/cmd/server/origin/master.go b/pkg/cmd/server/origin/master.go
@@ -311,7 +311,7 @@ func (c *MasterConfig) buildHandlerChain() (func(apiHandler http.Handler, kc *ap
 				})
 				handler = apifilters.WithAudit(handler, genericConfig.RequestContextMapper, c.AuditBackend, auditPolicyChecker, genericConfig.LongRunningFunc)
 			}
-			handler = serverhandlers.AuthenticationHandlerFilter(handler, c.Authenticator, genericConfig.RequestContextMapper)
+			handler = apifilters.WithAuthentication(handler, c.RequestContextMapper, c.Authenticator, apifilters.Unauthorized(false))
 			handler = apiserverfilters.WithCORS(handler, c.Options.CORSAllowedOrigins, nil, nil, nil, "true")
 			handler = apiserverfilters.WithTimeoutForNonLongRunningRequests(handler, genericConfig.RequestContextMapper, genericConfig.LongRunningFunc)
 			// TODO: MaxRequestsInFlight should be subdivided by intent, type of behavior, and speed of