Merge branch 'master' of github.com:src-d/go-git into mccurdyc/Issue#969/fix-flaky-ssh-test

2 files changed, 58 insertions, 1 deletions

diff --git a/plumbing/transport/http/common.go b/plumbing/transport/http/common.go
index c034846..5d3535e 100644
--- a/plumbing/transport/http/common.go
+++ b/plumbing/transport/http/common.go
@@ -4,6 +4,7 @@ package http
 import (
 	"bytes"
 	"fmt"
+	"net"
 	"net/http"
 	"strconv"
 	"strings"
@@ -151,6 +152,18 @@ func (s *session) ModifyEndpointIfRedirect(res *http.Response) {
 		return
 	}
 
+	h, p, err := net.SplitHostPort(r.URL.Host)
+	if err != nil {
+		h = r.URL.Host
+	}
+	if p != "" {
+		port, err := strconv.Atoi(p)
+		if err == nil {
+			s.endpoint.Port = port
+		}
+	}
+	s.endpoint.Host = h
+
 	s.endpoint.Protocol = r.URL.Scheme
 	s.endpoint.Path = r.URL.Path[:len(r.URL.Path)-len(infoRefsPath)]
 }
@@ -201,7 +214,14 @@ func (a *BasicAuth) String() string {
 	return fmt.Sprintf("%s - %s:%s", a.Name(), a.Username, masked)
 }
 
-// TokenAuth implements the go-git http.AuthMethod and transport.AuthMethod interfaces
+// TokenAuth implements an http.AuthMethod that can be used with http transport
+// to authenticate with HTTP token authentication (also known as bearer
+// authentication).
+//
+// IMPORTANT: If you are looking to use OAuth tokens with popular servers (e.g.
+// GitHub, Bitbucket, GitLab) you should use BasicAuth instead. These servers
+// use basic HTTP authentication, with the OAuth token as user or password.
+// Check the documentation of your git server for details.
 type TokenAuth struct {
 	Token string
 }
diff --git a/plumbing/transport/http/common_test.go b/plumbing/transport/http/common_test.go
index 71eede4..8b300e8 100644
--- a/plumbing/transport/http/common_test.go
+++ b/plumbing/transport/http/common_test.go
@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/cgi"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -119,6 +120,42 @@ func (s *ClientSuite) TestSetAuthWrongType(c *C) {
 	c.Assert(err, Equals, transport.ErrInvalidAuthMethod)
 }
 
+func (s *ClientSuite) TestModifyEndpointIfRedirect(c *C) {
+	sess := &session{endpoint: nil}
+	u, _ := url.Parse("https://example.com/info/refs")
+	res := &http.Response{Request: &http.Request{URL: u}}
+	c.Assert(func() {
+		sess.ModifyEndpointIfRedirect(res)
+	}, PanicMatches, ".*nil pointer dereference.*")
+
+	sess = &session{endpoint: nil}
+	// no-op - should return and not panic
+	sess.ModifyEndpointIfRedirect(&http.Response{})
+
+	data := []struct {
+		url      string
+		endpoint *transport.Endpoint
+		expected *transport.Endpoint
+	}{
+		{"https://example.com/foo/bar", nil, nil},
+		{"https://example.com/foo.git/info/refs",
+			&transport.Endpoint{},
+			&transport.Endpoint{Protocol: "https", Host: "example.com", Path: "/foo.git"}},
+		{"https://example.com:8080/foo.git/info/refs",
+			&transport.Endpoint{},
+			&transport.Endpoint{Protocol: "https", Host: "example.com", Port: 8080, Path: "/foo.git"}},
+	}
+
+	for _, d := range data {
+		u, _ := url.Parse(d.url)
+		sess := &session{endpoint: d.endpoint}
+		sess.ModifyEndpointIfRedirect(&http.Response{
+			Request: &http.Request{URL: u},
+		})
+		c.Assert(d.endpoint, DeepEquals, d.expected)
+	}
+}
+
 type BaseSuite struct {
 	fixtures.Suite