fix: base href does not work #11401 #10194 #2134

server/static/static.go

@@ -11,15 +11,22 @@ type FilesServer struct {
 	hsts            bool
 	xframeOpts      string
 	corsAllowOrigin string
+	Hash            func(string) string
 }
 
 func NewFilesServer(baseHRef string, hsts bool, xframeOpts string, corsAllowOrigin string) *FilesServer {
-	return &FilesServer{baseHRef, hsts, xframeOpts, corsAllowOrigin}
+	return &FilesServer{baseHRef, hsts, xframeOpts, corsAllowOrigin, Hash}
 }
 
 func (s *FilesServer) ServerFiles(w http.ResponseWriter, r *http.Request) {
+	if s.baseHRef != "/" {
+		p := strings.TrimPrefix(r.URL.Path, s.baseHRef)
+		if len(p) < len(r.URL.Path) {
+			r.URL.Path = p
+		}
+	}
 	// If there is no stored static file, we'll redirect to the js app
-	if Hash(strings.TrimLeft(r.URL.Path, "/")) == "" {
+	if s.Hash(strings.TrimLeft(r.URL.Path, "/")) == "" {
 		r.URL.Path = "index.html"
 	}
 

server/static/static_test.go

@@ -0,0 +1,28 @@
+package static
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestServeFile(t *testing.T) {
+	t.Run("should handle base href for static file", func(t *testing.T) {
+		filesServer := NewFilesServer("/argotest/", false, "", "")
+		filesServer.Hash = func(s string) string {
+			resources := map[string]string{
+				"main.js": "main.js",
+			}
+			return resources[s]
+		}
+
+		req := httptest.NewRequest(http.MethodGet, "/argotest/main.js", nil)
+		w := httptest.NewRecorder()
+
+		filesServer.ServerFiles(w, req)
+
+		if req.URL.Path != "main.js" {
+			t.Errorf("should handle base href, expect %v, got %v", "main.js", req.URL.Path)
+		}
+	})
+}