fix upgrade requests by placing query string in request body (#165)

infrahq · Aug 6, 2021 · 9c833a7 · 9c833a7
1 parent e2823be
commit 9c833a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/internal/cmd/client.go b/internal/cmd/client.go
@@ -113,6 +113,10 @@ func RunLocalClient() error {
 
 		timer.Reset(ClientTimeoutDuration)
 
+		if r.Header.Get("Upgrade") != "" {
+			r.Header.Add("X-Infra-Query", r.URL.RawQuery)
+		}
+
 		r.Header.Add("X-Infra-Authorization", r.Header.Get("Authorization"))
 		r.Header.Set("Authorization", "Bearer "+saToken)
 

diff --git a/internal/engine/engine.go b/internal/engine/engine.go
@@ -176,6 +176,12 @@ func proxyHandler(ca []byte, bearerToken string, remote *url.URL) (http.HandlerF
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
+		// Sometimes the kubernetes proxy strips query string for Upgrade requests
+		// so we need to put that in the request body
+		if r.Header.Get("X-Infra-Query") != "" {
+			r.URL.RawQuery = r.Header.Get("X-Infra-Query")
+		}
+
 		email, ok := r.Context().Value(HttpContextKeyEmail{}).(string)
 		if !ok {
 			logging.L.Debug("Proxy handler unable to retrieve email from context")