tshttp, derphttp: send Proxy-Authorization, not Authorization, to proxies

Whoops. But weirdly, sending Authorization sometimes worked?
This commit is contained in:
Brad Fitzpatrick
2020-08-28 20:58:14 -07:00
parent 3af2d671e6
commit 1e0be5a458
3 changed files with 20 additions and 4 deletions

View File

@@ -11,11 +11,14 @@ package tshttpproxy
import (
"context"
"fmt"
"log"
"net/http"
"net/url"
)
const proxyAuthHeader = "Proxy-Authorization"
func init() {
condSetTransportGetProxyConnectHeader = func(tr *http.Transport) {
tr.GetProxyConnectHeader = func(ctx context.Context, proxyURL *url.URL, target string) (http.Header, error) {
@@ -27,7 +30,16 @@ func init() {
if v == "" {
return nil, nil
}
return http.Header{"Authorization": []string{v}}, nil
return http.Header{proxyAuthHeader: []string{v}}, nil
}
tr.OnProxyConnectResponse = func(ctx context.Context, proxyURL *url.URL, connectReq *http.Request, res *http.Response) error {
auth := connectReq.Header.Get(proxyAuthHeader)
const truncLen = 20
if len(auth) > truncLen {
auth = fmt.Sprintf("%s...(%d total bytes)", auth[:truncLen], len(auth))
}
log.Printf("tshttpproxy: CONNECT response from %v for target %q (auth %q): %v", proxyURL, connectReq.Host, auth, res.Status)
return nil
}
}
}