qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 11:55:01 -07:00
Code Releases Activity

cmd/go: rank errUseProxy lower when handling proxy errors

Browse Source 
modfetch.TryProxies ranks errors returned by GOPROXY entries by
usefulness. It returns the error of the highest rank from the last
proxy. Errors from "direct" and "noproxy" are most useful, followed by
errors other than ErrNotExist, followed by ErrNotExist.

This change ranks errUseProxy with ErrNotExist even though it's
reported by "noproxy". There is almost always a more useful message
than "path does not match GOPRIVATE/GONOPROXY".

Fixes #39180

Change-Id: Ifa5b96462d7bf411e6d2d951888465c839d42471
Reviewed-on: https://go-review.googlesource.com/c/go/+/234687
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Jay Conrod 2020-05-20 17:54:55 -04:00
parent c53b2bdb35
commit 0cfe1fb878
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/go/internal/modfetch/proxy.go
View File

@ -196,8 +196,12 @@ func TryProxies(f func(proxy string) error) error {
// We try to report the most helpful error to the user. "direct" and "noproxy" // We try to report the most helpful error to the user. "direct" and "noproxy"
// errors are best, followed by proxy errors other than ErrNotExist, followed // errors are best, followed by proxy errors other than ErrNotExist, followed
// by ErrNotExist. Note that errProxyOff, errNoproxy, and errUseProxy are // by ErrNotExist.
// equivalent to ErrNotExist. //
// Note that errProxyOff, errNoproxy, and errUseProxy are equivalent to
// ErrNotExist. errUseProxy should only be returned if "noproxy" is the only
// proxy. errNoproxy should never be returned, since there should always be a
// more useful error from "noproxy" first.
const ( const (
notExistRank = iota notExistRank = iota
proxyRank proxyRank
@ -212,7 +216,7 @@ func TryProxies(f func(proxy string) error) error {
} }
isNotExistErr := errors.Is(err, os.ErrNotExist) isNotExistErr := errors.Is(err, os.ErrNotExist)
if proxy.url == "direct" || proxy.url == "noproxy" { if proxy.url == "direct" || (proxy.url == "noproxy" && err != errUseProxy) {
bestErr = err bestErr = err
bestErrRank = directRank bestErrRank = directRank
} else if bestErrRank <= proxyRank && !isNotExistErr { } else if bestErrRank <= proxyRank && !isNotExistErr {

10
src/cmd/go/testdata/script/mod_gonoproxy.txt vendored
View File

@ -10,7 +10,7 @@ env GOSUMDB=$sumdb' '$proxy/sumdb-wrong
! go get rsc.io/quote ! go get rsc.io/quote
stderr 'SECURITY ERROR' stderr 'SECURITY ERROR'
# but GONOSUMDB bypasses sumdb, for rsc.io/quote, rsc.io/sampler, golang.org/x/text # GONOSUMDB bypasses sumdb, for rsc.io/quote, rsc.io/sampler, golang.org/x/text
env GONOSUMDB='*/quote,*/*mple*,golang.org/x' env GONOSUMDB='*/quote,*/*mple*,golang.org/x'
go get rsc.io/quote go get rsc.io/quote
rm go.sum rm go.sum
@ -18,7 +18,13 @@ env GOPRIVATE='*/quote,*/*mple*,golang.org/x'
env GONOPROXY=none # that is, proxy all despite GOPRIVATE env GONOPROXY=none # that is, proxy all despite GOPRIVATE
go get rsc.io/quote go get rsc.io/quote
# and GONOPROXY bypasses proxy # When GOPROXY=off, fetching modules not matched by GONOPROXY fails.
env GONOPROXY=*/fortune
env GOPROXY=off
! go get golang.org/x/text
stderr '^go get golang.org/x/text: module lookup disabled by GOPROXY=off$'
# GONOPROXY bypasses proxy
[!net] skip [!net] skip
[!exec:git] skip [!exec:git] skip
env GOPRIVATE=none env GOPRIVATE=none