fix: add authorization from cookie to metadata

Signed-off-by: mikutas <[email protected]>
argoproj · Sep 23, 2022 · 0da92df · 0da92df
1 parent e6eb02f
commit 0da92df
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go
@@ -380,8 +380,13 @@ func (as *argoServer) newHTTPServer(ctx context.Context, port int, artifactServe
  mux.Handle("/oauth2/callback", handlers.ProxyHeaders(http.HandlerFunc(as.oAuth2Service.HandleCallback)))
  mux.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) {
  if os.Getenv("ARGO_SERVER_METRICS_AUTH") != "false" {
- header := metadata.New(map[string]string{"authorization": r.Header.Get("Authorization")})
- ctx := metadata.NewIncomingContext(context.Background(), header)
+ md := metadata.New(map[string]string{"authorization": r.Header.Get("Authorization")})
+ for _, c := range r.Cookies() {
+ if c.Name == "authorization" {
+ md.Append("cookie", c.Value)
+ }
+ }
+ ctx := metadata.NewIncomingContext(context.Background(), md)
  if _, err := as.gatekeeper.Context(ctx); err != nil {
  log.WithError(err).Error("failed to authenticate /metrics endpoint")
  w.WriteHeader(403)