do not try to add the selected policy to the context

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

.bingo/goverage.mod

@@ -2,4 +2,7 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.16
 
-require github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
+require (
+	github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
+	golang.org/x/tools v0.1.5 // indirect
+)

changelog/unreleased/proxy-access-log.md

@@ -1,5 +1,8 @@
 Bugfix: log all requests in the proxy access log
 
-We now use a dedicated middleware to log all requests, regardless of routing selector outcome. The log now includes the remote address and the selected routing policy.
+We now use a dedicated middleware to log all requests, regardless of routing selector outcome.
+While the log now includes the remote address, the selected routing policy is only logged when log level
+is set to debug because the request context cannot be changed in the `directorSelectionDirector`, as per
+the `ReverseProxy.Director` documentation. 
 
 https://github.com/owncloud/ocis/pull/2301

proxy/pkg/middleware/accesslog.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/go-chi/chi/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/proxy/pkg/proxy/policy"
 )
 
 // AccessLog is a middleware to log http requests at info level logging.
@@ -22,7 +21,6 @@ func AccessLog(logger log.Logger) func(http.Handler) http.Handler {
 				Str("request", r.Header.Get("X-Request-ID")).
 				Str("remote-addr", r.RemoteAddr).
 				Str("method", r.Method).
-				Str("routing-policy", policy.ContextGetPolicy(r.Context())).
 				Int("status", wrap.Status()).
 				Str("path", r.URL.Path).
 				Dur("duration", time.Since(start)).

proxy/pkg/middleware/oidc_auth.go

@@ -96,6 +96,7 @@ func (m oidcAuth) getClaims(token string, req *http.Request) (claims oidc.Standa
 			return
 		}
 
+		// TODO allow extracting arbitrary claims ... or require idp to send a specific claim
 		if err := userInfo.Claims(&claims); err != nil {
 			m.logger.Error().Err(err).Interface("userinfo", userInfo).Msg("failed to unmarshal userinfo claims")
 			status = http.StatusInternalServerError

proxy/pkg/proxy/policy/selector.go

@@ -20,20 +20,6 @@ var (
 	ErrUnexpectedConfigError = fmt.Errorf("could not initialize policy-selector for given config")
 )
 
-// policyKey serves as key for the routing policy in the context
-var policyKey struct{}
-
-// ContextGetPolicy returns the policy if set in the given context.
-func ContextGetPolicy(ctx context.Context) string {
-	u, _ := ctx.Value(policyKey).(string)
-	return u
-}
-
-// ContextSetPolicy stores the selected policy in the context.
-func ContextSetPolicy(ctx context.Context, p string) context.Context {
-	return context.WithValue(ctx, policyKey, p)
-}
-
 // Selector is a function which selects a proxy-policy based on the request.
 //
 // A policy is a random name which identifies a set of proxy-routes:

proxy/pkg/proxy/proxy.go

@@ -146,7 +146,6 @@ func (p *MultiHostReverseProxy) directorSelectionDirector(r *http.Request) {
 					Str("routeType", string(rt)).
 					Msg("director found")
 
-				r = r.WithContext(policy.ContextSetPolicy(r.Context(), pol))
 				p.Directors[pol][rt][endpoint](r)
 				return
 			}