server: make publicHostMatcher backwards compatible with gorilla/mux

Fixes #713.

Author: fsouza

fakestorage/server.go

@@ -20,6 +20,7 @@ import (
 	"net/http/httptest"
 	"net/http/httputil"
 	"net/textproto"
+	"regexp"
 	"strings"
 	"sync"
 
@@ -270,7 +271,11 @@ func (s *Server) buildMuxer() {
 
 // publicHostMatcher matches incoming requests against the currently specified server publicHost.
 func (s *Server) publicHostMatcher(r *http.Request, rm *mux.RouteMatch) bool {
-	return r.Host == s.publicHost
+	if strings.Contains(s.publicHost, ":") {
+		return r.Host == s.publicHost
+	}
+	matched, _ := regexp.MatchString("^"+regexp.QuoteMeta(s.publicHost), r.Host)
+	return matched
 }
 
 // Stop stops the server, closing all connections.

fakestorage/server_test.go

@@ -153,7 +153,7 @@ func TestDownloadObject(t *testing.T) {
 }
 
 func TestDownloadAfterPublicHostChange(t *testing.T) {
-	server, err := NewServerWithOptions(Options{PublicHost: "127.0.0.1", InitialObjects: []Object{
+	server, err := NewServerWithOptions(Options{PublicHost: "127.0.0.1:80", InitialObjects: []Object{
 		{ObjectAttrs: ObjectAttrs{BucketName: "some-bucket", Name: "files/txt/text-01.txt"}, Content: []byte("something")},
 	}})
 	if err != nil {
@@ -173,10 +173,10 @@ func TestDownloadAfterPublicHostChange(t *testing.T) {
 	}
 	defer resp.Body.Close()
 
-	// This first request should fail because we have specified a PublicHost of 127.0.0.1, which does
-	// not include the port generated by the test server.
+	// First request fails because the port configured in PublicHost
+	// doesn't match.
 	if resp.StatusCode != http.StatusNotFound {
-		t.Errorf("wrong status returned\nwant %d\ngot  %d", http.StatusNotFound, resp.StatusCode)
+		t.Fatalf("wrong status returned\nwant %d\ngot  %d", http.StatusNotFound, resp.StatusCode)
 	}
 
 	// Now set the public host to match the httptest.Server and try again.
@@ -202,6 +202,64 @@ func TestDownloadAfterPublicHostChange(t *testing.T) {
 	}
 }
 
+func TestDownloadPartialPublicHostMatch(t *testing.T) {
+	server, err := NewServerWithOptions(Options{PublicHost: "127.0.0.1", InitialObjects: []Object{
+		{ObjectAttrs: ObjectAttrs{BucketName: "some-bucket", Name: "files/txt/text-01.txt"}, Content: []byte("something")},
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	client := server.HTTPClient()
+	requestURL := server.URL() + "/some-bucket/files/txt/text-01.txt"
+
+	req, err := http.NewRequest(http.MethodGet, requestURL, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		t.Errorf("wrong status returned\nwant %d\ngot  %d", http.StatusOK, resp.StatusCode)
+	}
+}
+
+func TestDownloadPartialHostValidationShouldntValidatePortPartially(t *testing.T) {
+	server, err := NewServerWithOptions(Options{PublicHost: "127.0.0.1", InitialObjects: []Object{
+		{ObjectAttrs: ObjectAttrs{BucketName: "some-bucket", Name: "files/txt/text-01.txt"}, Content: []byte("something")},
+	}})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	client := server.HTTPClient()
+	requestURL := server.URL() + "/some-bucket/files/txt/text-01.txt"
+
+	serverURL, err := url.Parse(server.URL())
+	if err != nil {
+		t.Fatal(err)
+	}
+	server.publicHost = serverURL.Hostname() + ":" + serverURL.Port()[:2]
+
+	req, err := http.NewRequest(http.MethodGet, requestURL, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusNotFound {
+		t.Errorf("wrong status returned\nwant %d\ngot  %d", http.StatusNotFound, resp.StatusCode)
+	}
+}
+
 func testDownloadObject(t *testing.T, server *Server) {
 	tests := []struct {
 		name            string