Skip to content

Commit

Permalink
Reorder Auth and TLSClientHeaders middleware
Browse files Browse the repository at this point in the history
This provides ForwardAuth the chance to inspect and make decisions based
on the TLS information.
  • Loading branch information
tomberek committed Mar 5, 2019
1 parent 1206cd5 commit 36af054
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions server/server_middlewares.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ func (s *Server) buildMiddlewares(frontendName string, frontend *types.Frontend,
middle = append(middle, handler)
}

// TLSClientHeaders
tlsClientHeadersMiddleware := middlewares.NewTLSClientHeaders(frontend)
if tlsClientHeadersMiddleware != nil {
log.Debugf("Adding TLSClientHeaders middleware for frontend %s", frontendName)

handler := s.tracingMiddleware.NewNegroniHandlerWrapper("TLSClientHeaders", tlsClientHeadersMiddleware, false)
middle = append(middle, handler)
}

// Authentication
if frontend.Auth != nil {
authMiddleware, err := mauth.NewAuthenticator(frontend.Auth, s.tracingMiddleware)
Expand All @@ -123,15 +132,6 @@ func (s *Server) buildMiddlewares(frontendName string, frontend *types.Frontend,
middle = append(middle, handler)
}

// TLSClientHeaders
tlsClientHeadersMiddleware := middlewares.NewTLSClientHeaders(frontend)
if tlsClientHeadersMiddleware != nil {
log.Debugf("Adding TLSClientHeaders middleware for frontend %s", frontendName)

handler := s.tracingMiddleware.NewNegroniHandlerWrapper("TLSClientHeaders", tlsClientHeadersMiddleware, false)
middle = append(middle, handler)
}

return middle, buildModifyResponse(secureMiddleware, headerMiddleware), postConfig, nil
}

Expand Down

0 comments on commit 36af054

Please sign in to comment.