Skip to content

Allow for IPv6 addresses #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow for IPv6 addresses #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "encoding/base64"

const (
hdrProxyAuthResp = "Proxy-Authorization"
hdrProxyAuthReq = "Proxy-Authenticate"
hdrProxyAuthReq = "Proxy-Authenticate"
)

// ProxyAuthorization allows for plugging in arbitrary implementations of the "Proxy-Authorization" handler.
Expand Down
16 changes: 8 additions & 8 deletions dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ type HttpTunnel struct {
func (t *HttpTunnel) parseProxyUrl(proxyUrl *url.URL) {
t.proxyAddr = proxyUrl.Host
if strings.ToLower(proxyUrl.Scheme) == "https" {
if !strings.Contains(t.proxyAddr, ":") {
t.proxyAddr = t.proxyAddr + ":443"
if _, _, err := net.SplitHostPort(t.proxyAddr); err != nil {
t.proxyAddr = net.JoinHostPort(t.proxyAddr, "443")
}
t.isTls = true
} else {
if !strings.Contains(t.proxyAddr, ":") {
t.proxyAddr = t.proxyAddr + ":8080"
if _, _, err := net.SplitHostPort(t.proxyAddr); err != nil {
t.proxyAddr = net.JoinHostPort(t.proxyAddr, "8080")
}
t.isTls = false
}
Expand Down Expand Up @@ -108,7 +108,7 @@ func (t *HttpTunnel) Dial(network string, address string) (net.Conn, error) {
Header: make(http.Header),
}
if t.auth != nil && t.auth.InitialResponse() != "" {
req.Header.Set(hdrProxyAuthResp, t.auth.Type() + " " + t.auth.InitialResponse())
req.Header.Set(hdrProxyAuthResp, t.auth.Type()+" "+t.auth.InitialResponse())
}
resp, err := t.doRoundtrip(conn, req)
if err != nil {
Expand All @@ -122,7 +122,7 @@ func (t *HttpTunnel) Dial(network string, address string) (net.Conn, error) {
conn.Close()
return nil, err
}
req.Header.Set(hdrProxyAuthResp, t.auth.Type() + " " + responseHdr)
req.Header.Set(hdrProxyAuthResp, t.auth.Type()+" "+responseHdr)
resp, err = t.doRoundtrip(conn, req)
if err != nil {
conn.Close()
Expand All @@ -149,10 +149,10 @@ func (t *HttpTunnel) doRoundtrip(conn net.Conn, req *http.Request) (*http.Respon

func (t *HttpTunnel) performAuthChallengeResponse(resp *http.Response) (string, error) {
respAuthHdr := resp.Header.Get(hdrProxyAuthReq)
if !strings.Contains(respAuthHdr, t.auth.Type() + " ") {
if !strings.Contains(respAuthHdr, t.auth.Type()+" ") {
return "", fmt.Errorf("http_tunnel: expected '%v' Proxy authentication, got: '%v'", t.auth.Type(), respAuthHdr)
}
splits := strings.SplitN(respAuthHdr, " ", 2)
challenge := splits[1]
return t.auth.ChallengeResponse(challenge), nil
}
}