Merge pull request #10105 from caesarxuchao/fix-9287

exclude the port number when checking a request in "kubectl proxy"
This commit is contained in:
Satnam Singh 2015-06-19 15:16:38 -07:00
commit b05bd0c59f

View File

@ -18,6 +18,7 @@ package kubectl
import ( import (
"fmt" "fmt"
"net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
@ -94,8 +95,10 @@ func (f *FilterServer) accept(method, path, host string) bool {
} }
func (f *FilterServer) ServeHTTP(rw http.ResponseWriter, req *http.Request) { func (f *FilterServer) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if f.accept(req.Method, req.URL.Path, req.Host) { host, _, _ := net.SplitHostPort(req.Host)
if f.accept(req.Method, req.URL.Path, host) {
f.delegate.ServeHTTP(rw, req) f.delegate.ServeHTTP(rw, req)
return
} }
rw.WriteHeader(http.StatusForbidden) rw.WriteHeader(http.StatusForbidden)
rw.Write([]byte("<h3>Unauthorized</h3>")) rw.Write([]byte("<h3>Unauthorized</h3>"))