Skip to content

Commit

Permalink
Set "Metadata-Flavor: Google" header (#10)
Browse files Browse the repository at this point in the history
* Set Metadata-Flavor header in all SA metadata handlers

* Set Metadata-Flavor header in newResponseWriter instead
  • Loading branch information
natarajaya authored and imduffy15 committed Jul 24, 2019
1 parent d1f4988 commit d2ad327
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions server/server.go
Expand Up @@ -37,6 +37,8 @@ const (
defaultMetadataProxyAddress = "127.0.0.1:988"
defaultEnableMetadataProxy = false
defaultNamespaceKey = "accounts.google.com/allowed-service-accounts"
defaultFlavorHeaderName = "Metadata-Flavor"
defaultFlavorHeaderValue = "Google"
)

// Server encapsulates all of the parameters necessary for starting up
Expand Down Expand Up @@ -84,6 +86,8 @@ func (rw *responseWriter) WriteHeader(code int) {
}

func newResponseWriter(w http.ResponseWriter) *responseWriter {
// Set "Metadata-Flavor: Google" header
w.Header().Set(defaultFlavorHeaderName, defaultFlavorHeaderValue)
return &responseWriter{w, http.StatusOK}
}

Expand Down Expand Up @@ -372,6 +376,8 @@ func (s *Server) reverseProxyHandler(logger *log.Entry, w http.ResponseWriter, r
host = s.MetadataProxyAddress
}

// Delete "Metadata-Flavor: Google" header to avoid duplication
w.Header().Del(defaultFlavorHeaderName)
proxy := httputil.NewSingleHostReverseProxy(&url.URL{Scheme: "http", Host: host})
proxy.Transport = xForwardedForStripper{}
proxy.ServeHTTP(w, r)
Expand Down

0 comments on commit d2ad327

Please sign in to comment.