Add auth middleware

basculehttp/chain.go

@@ -31,15 +31,16 @@ type MetricListenerIn struct {
 // ChainIn is used for uber fx wiring.
 type ChainIn struct {
 	fx.In
-	SetLogger   alice.Constructor `name:"alice_set_logger"`
-	Constructor alice.Constructor `name:"alice_constructor"`
-	Enforcer    alice.Constructor `name:"alice_enforcer"`
-	Listener    alice.Constructor `name:"alice_listener"`
+	SetLogger     alice.Constructor `name:"alice_set_logger"`
+	Constructor   alice.Constructor `name:"alice_constructor"`
+	Enforcer      alice.Constructor `name:"alice_enforcer"`
+	Listener      alice.Constructor `name:"alice_listener"`
+	SetLoggerInfo alice.Constructor `name:"alice_set_logger_info"`
 }
 
 // Build provides the alice constructors chained together in a set order.
 func (c ChainIn) Build() alice.Chain {
-	return alice.New(c.SetLogger, c.Constructor, c.Enforcer, c.Listener)
+	return alice.New(c.SetLogger, c.Constructor, c.Enforcer, c.Listener, c.SetLoggerInfo)
 }
 
 // ProvideServerChain builds the alice middleware and then provides them

basculehttp/log.go

@@ -136,26 +136,35 @@ func ProvideLogger() fx.Option {
 					return WithELogger(getZapLogger(getLogger))
 				},
 			},
+
+			// add info to logger
+			fx.Annotated{
+				Name:   "alice_set_logger_info",
+				Target: SetBasculeInfo,
+			},
 		),
 	)
 }
 
-// SetBasculeInfo takes the logger and bascule Auth out of the context and adds
+// SetBasculeInfo creates an alice constructor that takes
+// the logger and bascule Auth and adds
 // relevant bascule information to the logger before putting the logger
 // back in the context.
-func SetBasculeInfo(ctx context.Context) alice.Constructor {
+func SetBasculeInfo() alice.Constructor {
 	return func(delegate http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ctx := r.Context()
+			logger := sallust.Get(ctx)
+
 			var satClientID = "N/A"
 			// retrieve satClientID from request context
 			if auth, ok := bascule.FromContext(r.Context()); ok {
 				satClientID = auth.Token.Principal()
 			}
 
-			logger := sallust.Get(ctx)
 			logger.With(zap.String("satClientID", satClientID))
 
-			sallust.With(ctx, logger)
+			r = r.WithContext(sallust.With(ctx, logger))
 
 			delegate.ServeHTTP(w, r)
 		})