enable updating of publicHost through server config

fsouza · Mar 10, 2022 · d23a4c5 · d23a4c5
1 parent 71fdd6b
commit d23a4c5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/fakestorage/config.go b/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}
 }
diff --git a/fakestorage/server.go b/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,18 @@ 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
+}
+
+// bucketHostMatcher matches incoming requests against the bucket subdomain of the
+// currently specified server publicHost.
+func (s *Server) bucketHostMatcher(r *http.Request, rm *mux.RouteMatch) bool {
+	bucketHost := fmt.Sprintf("{bucketName}.%s", s.publicHost)
+	return r.Host == bucketHost
+}
+
 // Stop stops the server, closing all connections.
 func (s *Server) Stop() {
 	if s.ts != nil {

diff --git a/fakestorage/server_test.go b/fakestorage/server_test.go
@@ -276,16 +276,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 +326,7 @@ func TestUpdateServerConfig(t *testing.T) {
 			}
 
 			assert.Equal(t, test.expectedExternalUrl, server.externalURL)
+			assert.Equal(t, test.expectedPublicHost, server.publicHost)
 		})
 	}
 }