enable updating of publicHost through server config (#712)

* enable updating of publicHost through server config

* add a confirming test

fakestorage/config.go

@@ -9,6 +9,7 @@ func (s *Server) updateServerConfig(r *http.Request) jsonResponse {
 
 	var configOptions struct {
 		ExternalUrl string `json:"externalUrl,omitempty"`
+		PublicHost  string `json:"publicHost,omitempty"`
 	}
 	err := json.NewDecoder(r.Body).Decode(&configOptions)
 	if err != nil {
@@ -22,5 +23,9 @@ func (s *Server) updateServerConfig(r *http.Request) jsonResponse {
 		s.externalURL = configOptions.ExternalUrl
 	}
 
+	if configOptions.PublicHost != "" {
+		s.publicHost = configOptions.PublicHost
+	}
+
 	return jsonResponse{status: http.StatusOK}
 }

fakestorage/server.go

@@ -218,7 +218,7 @@ func (s *Server) buildMuxer() {
 
 	routers := []*mux.Router{
 		s.mux.PathPrefix(apiPrefix).Subrouter(),
-		s.mux.Host(s.publicHost).PathPrefix(apiPrefix).Subrouter(),
+		s.mux.MatcherFunc(s.publicHostMatcher).PathPrefix(apiPrefix).Subrouter(),
 	}
 
 	for _, r := range routers {
@@ -242,7 +242,7 @@ func (s *Server) buildMuxer() {
 
 	// Internal / update server configuration
 	s.mux.Path("/_internal/config").Methods(http.MethodPut).HandlerFunc(jsonToHTTPHandler(s.updateServerConfig))
-	s.mux.Host(s.publicHost).Path("/_internal/config").Methods(http.MethodPut).HandlerFunc(jsonToHTTPHandler(s.updateServerConfig))
+	s.mux.MatcherFunc(s.publicHostMatcher).Path("/_internal/config").Methods(http.MethodPut).HandlerFunc(jsonToHTTPHandler(s.updateServerConfig))
 	// Internal - end
 
 	bucketHost := fmt.Sprintf("{bucketName}.%s", s.publicHost)
@@ -252,10 +252,10 @@ func (s *Server) buildMuxer() {
 	s.mux.Path("/upload/resumable/{uploadId}").Methods(http.MethodPut, http.MethodPost).HandlerFunc(jsonToHTTPHandler(s.uploadFileContent))
 
 	// Batch endpoint
-	s.mux.Host(s.publicHost).Path("/batch/storage/v1").Methods(http.MethodPost).HandlerFunc(s.handleBatchCall)
+	s.mux.MatcherFunc(s.publicHostMatcher).Path("/batch/storage/v1").Methods(http.MethodPost).HandlerFunc(s.handleBatchCall)
 	s.mux.Path("/batch/storage/v1").Methods(http.MethodPost).HandlerFunc(s.handleBatchCall)
 
-	s.mux.Host(s.publicHost).Path("/{bucketName}/{objectName:.+}").Methods(http.MethodGet, http.MethodHead).HandlerFunc(s.downloadObject)
+	s.mux.MatcherFunc(s.publicHostMatcher).Path("/{bucketName}/{objectName:.+}").Methods(http.MethodGet, http.MethodHead).HandlerFunc(s.downloadObject)
 	s.mux.Host("{bucketName:.+}").Path("/{objectName:.+}").Methods(http.MethodGet, http.MethodHead).HandlerFunc(s.downloadObject)
 
 	// Form Uploads
@@ -268,6 +268,11 @@ func (s *Server) buildMuxer() {
 	s.mux.Host("{bucketName:.+}").Path("/{objectName:.+}").Methods(http.MethodPost, http.MethodPut).HandlerFunc(jsonToHTTPHandler(s.insertObject))
 }
 
+// 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
+}
+
 // Stop stops the server, closing all connections.
 func (s *Server) Stop() {
 	if s.ts != nil {

fakestorage/server_test.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 	"strings"
 	"testing"
 
@@ -151,6 +152,56 @@ func TestDownloadObject(t *testing.T) {
 	runServersTest(t, objs, testDownloadObjectRange)
 }
 
+func TestDownloadAfterPublicHostChange(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()
+
+	// 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.
+	if resp.StatusCode != http.StatusNotFound {
+		t.Errorf("wrong status returned\nwant %d\ngot  %d", http.StatusNotFound, resp.StatusCode)
+	}
+
+	// Now set the public host to match the httptest.Server and try again.
+	serverURL, err := url.Parse(server.URL())
+	if err != nil {
+		t.Fatal(err)
+	}
+	server.publicHost = serverURL.Host
+
+	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()
+
+	// This second request should succeed because the public host now matches.
+	if resp.StatusCode != http.StatusOK {
+		t.Errorf("wrong status returned\nwant %d\ngot  %d", http.StatusOK, resp.StatusCode)
+	}
+}
+
 func testDownloadObject(t *testing.T, server *Server) {
 	tests := []struct {
 		name            string
@@ -276,16 +327,25 @@ func TestUpdateServerConfig(t *testing.T) {
 		name                string
 		requestBody         string
 		expectedExternalUrl string
+		expectedPublicHost  string
 	}{
 		{
 			"PUT: empty json",
 			"{}",
 			"https://0.0.0.0:4443",
+			"0.0.0.0:4443",
 		},
 		{
 			"PUT: externalUrl provided",
 			"{\"externalUrl\": \"https://1.2.3.4:4321\"}",
 			"https://1.2.3.4:4321",
+			"0.0.0.0:4443",
+		},
+		{
+			"PUT: publicHost provided",
+			"{\"publicHost\": \"1.2.3.4:4321\"}",
+			"https://1.2.3.4:4321",
+			"1.2.3.4:4321",
 		},
 	}
 
@@ -317,6 +377,7 @@ func TestUpdateServerConfig(t *testing.T) {
 			}
 
 			assert.Equal(t, test.expectedExternalUrl, server.externalURL)
+			assert.Equal(t, test.expectedPublicHost, server.publicHost)
 		})
 	}
 }