github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Add URL parameters to proxy redirect Location header

Browse Source 
When a URL that doesn't end in "/" is sent to the API proxy,
the proxy responds with a redirect to the URL with a "/" at the
end. The problem is that this redirect path does not include
query parameters that were passed in the original request. This
is a fix to that issue.
This commit is contained in:
Cesar Wong 2015-04-16 17:24:01 -04:00
parent 0fc94155cf
commit e09b8c99dc
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apiserver/proxy.go
View File

@ -195,7 +195,11 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
// This is essentially a hack for https://github.com/GoogleCloudPlatform/kubernetes/issues/4958. // This is essentially a hack for https://github.com/GoogleCloudPlatform/kubernetes/issues/4958.
// Note: Keep this code after tryUpgrade to not break that flow. // Note: Keep this code after tryUpgrade to not break that flow.
if len(parts) == 2 && !strings.HasSuffix(req.URL.Path, "/") { if len(parts) == 2 && !strings.HasSuffix(req.URL.Path, "/") {
w.Header().Set("Location", req.URL.Path+"/") var queryPart string
if len(req.URL.RawQuery) > 0 {
queryPart = "?" + req.URL.RawQuery
}
w.Header().Set("Location", req.URL.Path+"/"+queryPart)
w.WriteHeader(http.StatusMovedPermanently) w.WriteHeader(http.StatusMovedPermanently)
return return
} }

15
pkg/apiserver/proxy_test.go
View File

@ -374,13 +374,15 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
path string path string
// The path requested on the proxy server. // The path requested on the proxy server.
proxyServerPath string proxyServerPath string
// query string
query string
}{ }{
{"/trailing/slash/", "/trailing/slash/"}, {"/trailing/slash/", "/trailing/slash/", ""},
{"/", "/"}, {"/", "/", "test1=value1&test2=value2"},
// "/" should be added at the end. // "/" should be added at the end.
{"", "/"}, {"", "/", "test1=value1&test2=value2"},
// "/" should not be added at a non-root path. // "/" should not be added at a non-root path.
{"/some/path", "/some/path"}, {"/some/path", "/some/path", ""},
} }
for _, item := range table { for _, item := range table {
@ -388,6 +390,9 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
if req.URL.Path != item.proxyServerPath { if req.URL.Path != item.proxyServerPath {
t.Errorf("Unexpected request on path: %s, expected path: %s, item: %v", req.URL.Path, item.proxyServerPath, item) t.Errorf("Unexpected request on path: %s, expected path: %s, item: %v", req.URL.Path, item.proxyServerPath, item)
} }
if req.URL.RawQuery != item.query {
t.Errorf("Unexpected query on url: %s, expected: %s", req.URL.RawQuery, item.query)
}
})) }))
defer proxyServer.Close() defer proxyServer.Close()
@ -405,7 +410,7 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
proxyTestPattern := "/api/version2/proxy/namespaces/ns/foo/id" + item.path proxyTestPattern := "/api/version2/proxy/namespaces/ns/foo/id" + item.path
req, err := http.NewRequest( req, err := http.NewRequest(
"GET", "GET",
server.URL+proxyTestPattern, server.URL+proxyTestPattern+"?"+item.query,
strings.NewReader(""), strings.NewReader(""),
) )
if err != nil { if err != nil {