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

move httpProxyDialer to newHTTPProxyDialerFunc()

This commit is contained in:
Cooper Oh 2024-07-18 21:44:12 +09:00
parent dc42337df9
commit 75fbe70bee
2 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client.go
View File

@ -255,23 +255,21 @@ func (d *Dialer) DialContext(ctx context.Context, urlStr string, requestHeader h
return nil, nil, err return nil, nil, err
} }
if proxyURL != nil { if proxyURL != nil {
netDial, err = func(proxyURL *url.URL, forwardDial netDialerFunc) (netDialerFunc, error) { forwardDial := newNetDialerFunc(proxyURL.Scheme, d.NetDial, d.NetDialContext, d.NetDialTLSContext)
if proxyURL.Scheme == "http" { if proxyURL.Scheme == "http" || proxyURL.Scheme == "https" {
return (&httpProxyDialer{proxyURL: proxyURL, forwardDial: forwardDial}).DialContext, nil netDial = newHTTPProxyDialerFunc(proxyURL, forwardDial)
} } else {
dialer, err := proxy.FromURL(proxyURL, forwardDial) dialer, err := proxy.FromURL(proxyURL, forwardDial)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
if d, ok := dialer.(proxy.ContextDialer); ok { if d, ok := dialer.(proxy.ContextDialer); ok {
return d.DialContext, nil netDial = d.DialContext
} } else {
return func(ctx context.Context, net, addr string) (net.Conn, error) { netDial = func(ctx context.Context, net, addr string) (net.Conn, error) {
return dialer.Dial(net, addr) return dialer.Dial(net, addr)
}, nil }
}(proxyURL, netDial) }
if err != nil {
return nil, nil, err
} }
} }
} }

15
proxy.go
View File

@ -46,20 +46,16 @@ func (fn netDialerFunc) DialContext(ctx context.Context, network, addr string) (
return fn(ctx, network, addr) return fn(ctx, network, addr)
} }
type httpProxyDialer struct { func newHTTPProxyDialerFunc(proxyURL *url.URL, forwardDial netDialerFunc) netDialerFunc {
proxyURL *url.URL return func(ctx context.Context, network, addr string) (net.Conn, error) {
forwardDial netDialerFunc hostPort, _ := hostPortNoPort(proxyURL)
} conn, err := forwardDial(ctx, network, hostPort)
func (hpd *httpProxyDialer) DialContext(ctx context.Context, network string, addr string) (net.Conn, error) {
hostPort, _ := hostPortNoPort(hpd.proxyURL)
conn, err := hpd.forwardDial(ctx, network, hostPort)
if err != nil { if err != nil {
return nil, err return nil, err
} }
connectHeader := make(http.Header) connectHeader := make(http.Header)
if user := hpd.proxyURL.User; user != nil { if user := proxyURL.User; user != nil {
proxyUser := user.Username() proxyUser := user.Username()
if proxyPassword, passwordSet := user.Password(); passwordSet { if proxyPassword, passwordSet := user.Password(); passwordSet {
credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword)) credential := base64.StdEncoding.EncodeToString([]byte(proxyUser + ":" + proxyPassword))
@ -105,3 +101,4 @@ func (hpd *httpProxyDialer) DialContext(ctx context.Context, network string, add
} }
return conn, nil return conn, nil
} }
}