github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3509 from enisoc/apiserver-proxy-trailing-slash

Browse Source 
Preserve trailing slash in apiserver proxy.
This commit is contained in:
Nikhil Jindal 2015-01-15 15:13:49 -08:00
commit e6c5d59a55
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apiserver/proxy.go
View File

@ -96,6 +96,12 @@ func (r *ProxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
if len(parts) > 2 { if len(parts) > 2 {
proxyParts := parts[2:] proxyParts := parts[2:]
rest = strings.Join(proxyParts, "/") rest = strings.Join(proxyParts, "/")
if strings.HasSuffix(req.URL.Path, "/") {
// The original path had a trailing slash, which has been stripped
// by KindAndNamespace(). We should add it back because some
// servers (like etcd) require it.
rest = rest + "/"
}
} }
storage, ok := r.storage[kind] storage, ok := r.storage[kind]
if !ok { if !ok {

1
pkg/apiserver/proxy_test.go
View File

@ -174,6 +174,7 @@ func TestProxy(t *testing.T) {
{"PUT", "/some/dir/id", "different question", "answer", "text/css", "default"}, {"PUT", "/some/dir/id", "different question", "answer", "text/css", "default"},
{"DELETE", "/some/dir/id", "", "ok", "text/css", "default"}, {"DELETE", "/some/dir/id", "", "ok", "text/css", "default"},
{"GET", "/some/dir/id", "", "answer", "text/css", "other"}, {"GET", "/some/dir/id", "", "answer", "text/css", "other"},
{"GET", "/trailing/slash/", "", "answer", "text/css", "default"},
} }
for _, item := range table { for _, item := range table {