Merge pull request #1001 from hairyhenderson/fix-redirect-on-clone

plumbing: transport/http, Add missing host/port on redirect. Fixes #820

1 files changed, 37 insertions, 0 deletions

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