lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tshttpproxy: move the TS_DEBUG_FAKE_PROXY_AUTH knob up a level

reviewable/pr720/r1
Brad Fitzpatrick 2020-08-27 08:14:03 -07:00
parent aa1da24f18
commit 2bac125cad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tshttpproxy/tshttpproxy.go
View File

@ -9,6 +9,7 @@ package tshttpproxy
import ( import (
"net/http" "net/http"
"net/url" "net/url"
"os"
) )
// sysProxyFromEnv, if non-nil, specifies a platform-specific ProxyFromEnvironment // sysProxyFromEnv, if non-nil, specifies a platform-specific ProxyFromEnvironment
@ -36,6 +37,9 @@ var sysAuthHeader func(*url.URL) (string, error)
// GetAuthHeader returns the Authorization header value to send to proxy u. // GetAuthHeader returns the Authorization header value to send to proxy u.
func GetAuthHeader(u *url.URL) (string, error) { func GetAuthHeader(u *url.URL) (string, error) {
if fake := os.Getenv("TS_DEBUG_FAKE_PROXY_AUTH"); fake != "" {
return fake, nil
}
if sysAuthHeader != nil { if sysAuthHeader != nil {
return sysAuthHeader(u) return sysAuthHeader(u)
} }

4
net/tshttpproxy/tshttpproxy_future.go
View File

@ -14,7 +14,6 @@ import (
"log" "log"
"net/http" "net/http"
"net/url" "net/url"
"os"
) )
func init() { func init() {
@ -25,9 +24,6 @@ func init() {
log.Printf("failed to get proxy Auth header for %v; ignoring: %v", proxyURL, err) log.Printf("failed to get proxy Auth header for %v; ignoring: %v", proxyURL, err)
return nil, nil return nil, nil
} }
if fake := os.Getenv("TS_DEBUG_FAKE_PROXY_AUTH"); fake != "" {
v = fake
}
if v == "" { if v == "" {
return nil, nil return nil, nil
} }