mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/http: remove redundant port validation 

The URL port is already checked in net/url, so we can remove the redundant validation in net/http.

Fixes #33600
This commit is contained in:
Derek Phan 2019-08-12 17:55:11 -07:00
parent 61bb56ad63
commit c19afa3102
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/http/transport.go
View File

@ -710,20 +710,10 @@ func resetProxyConfig() {
} }
func (t *Transport) connectMethodForRequest(treq *transportRequest) (cm connectMethod, err error) { func (t *Transport) connectMethodForRequest(treq *transportRequest) (cm connectMethod, err error) {
// TODO: the validPort check is redundant after CL 189258, as url.URL.Port
// only returns valid ports now. golang.org/issue/33600
if port := treq.URL.Port(); !validPort(port) {
return cm, fmt.Errorf("invalid URL port %q", port)
}
cm.targetScheme = treq.URL.Scheme cm.targetScheme = treq.URL.Scheme
cm.targetAddr = canonicalAddr(treq.URL) cm.targetAddr = canonicalAddr(treq.URL)
if t.Proxy != nil { if t.Proxy != nil {
cm.proxyURL, err = t.Proxy(treq.Request) cm.proxyURL, err = t.Proxy(treq.Request)
if err == nil && cm.proxyURL != nil {
if port := cm.proxyURL.Port(); !validPort(port) {
return cm, fmt.Errorf("invalid proxy URL port %q", port)
}
}
} }
cm.onlyH1 = treq.requiresHTTP1() cm.onlyH1 = treq.requiresHTTP1()
return cm, err return cm, err
@ -2676,15 +2666,3 @@ func (cl *connLRU) remove(pc *persistConn) {
func (cl *connLRU) len() int { func (cl *connLRU) len() int {
return len(cl.m) return len(cl.m)
} }
// validPort reports whether p (without the colon) is a valid port in
// a URL, per RFC 3986 Section 3.2.3, which says the port may be
// empty, or only contain digits.
func validPort(p string) bool {
for _, r := range []byte(p) {
if r < '0' || r > '9' {
return false
}
}
return true
}