1
0
mirror of https://github.com/golang/go synced 2024-09-30 07:28:36 -06:00

net/http: fix ProxyFromEnvironment panic on invalid $NO_PROXY value

Given an entry in $no_proxy like ":1" we would interpret it as an empty
host name and a port number, then check the first character of the host
name for dots. This would then cause an index out of range panic. This
change simply skips these entries, as the following checks would anyway
have returned false.

Fixes #19536

Change-Id: Iafe9c7a77ad4a6278c8ccb00a1575b56e4bdcd79
Reviewed-on: https://go-review.googlesource.com/38067
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Jakob Borg 2017-03-14 08:21:51 +09:00 committed by Brad Fitzpatrick
parent df68afd07c
commit 4e35e5fcab
2 changed files with 10 additions and 0 deletions

View File

@ -79,3 +79,9 @@ func ResetProxyEnv() {
}
ResetCachedEnvironment()
}
func TestInvalidNoProxy(t *testing.T) {
ResetProxyEnv()
os.Setenv("NO_PROXY", ":1")
useProxy("example.com:80") // should not panic
}

View File

@ -1227,6 +1227,10 @@ func useProxy(addr string) bool {
if addr == p {
return false
}
if len(p) == 0 {
// There is no host part, likely the entry is malformed; ignore.
continue
}
if p[0] == '.' && (strings.HasSuffix(addr, p) || addr == p[1:]) {
// no_proxy ".foo.com" matches "bar.foo.com" or "foo.com"
return false