Skip to content

Commit

Permalink
Revert "disable TSB client cert and front proxy auth until aggregatio…
Browse files Browse the repository at this point in the history
…n is on by default"

This reverts commit a564e15.
  • Loading branch information
deads2k committed Aug 11, 2017
1 parent 1243b94 commit 950b29c
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions pkg/openservicebroker/cmd/server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,9 @@ func (o TemplateServiceBrokerServerOptions) Config() (*server.TemplateServiceBro
if err := o.SecureServing.ApplyTo(serverConfig); err != nil {
return nil, err
}

// TODO restore this after https://github.com/openshift/openshift-ansible/issues/5056 is fixed
//if err := o.Authentication.ApplyTo(serverConfig); err != nil {
// return nil, err
//}
// the TSB server *can* limp along without terminating client certs or front proxy authn. Do that for now
// this wiring is a bit tricky.
cfg, err := o.Authentication.ToAuthenticationConfig()
if err != nil {
return nil, err
}
authenticator, _, err := cfg.New()
if err != nil {
if err := o.Authentication.ApplyTo(serverConfig); err != nil {
return nil, err
}
serverConfig.Authenticator = authenticator

if err := o.Authorization.ApplyTo(serverConfig); err != nil {
return nil, err
}
Expand Down

0 comments on commit 950b29c

Please sign in to comment.