diff --git a/router.go b/router.go index 4afa741537..5cbecbceab 100644 --- a/router.go +++ b/router.go @@ -5,6 +5,7 @@ package fiber import ( + "bytes" "fmt" "html" "sort" @@ -357,6 +358,12 @@ func (app *App) registerStatic(prefix, root string, config ...Static) { IndexNames: []string{"index.html"}, PathRewrite: func(fctx *fasthttp.RequestCtx) []byte { path := fctx.Path() + mountPath := app.MountPath() + if n := len(mountPath); n > 0 { + if bytes.Equal(path[:n], utils.UnsafeBytes(mountPath)) { + path = path[n:] + } + } if len(path) >= prefixLen { if isStar && app.getString(path[0:prefixLen]) == prefix { path = append(path[0:0], '/') diff --git a/router_test.go b/router_test.go index 6a43db5937..a45547ddac 100644 --- a/router_test.go +++ b/router_test.go @@ -354,7 +354,7 @@ func Test_Router_Handler_Catch_Error(t *testing.T) { func Test_Route_Static_Root(t *testing.T) { t.Parallel() - dir := "./.github/testdata/fs/css" + dir := "./.github/testdata/fs/css" //nolint:goconst // ignore lint app := New() app.Static("/", dir, Static{ Browse: true, @@ -471,6 +471,37 @@ func Test_Route_Static_HasPrefix(t *testing.T) { body, err = io.ReadAll(resp.Body) utils.AssertEqual(t, nil, err, "app.Test(req)") utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) + + app = New() + app.Static("/css", dir) + + resp, err = app.Test(httptest.NewRequest(MethodGet, "/css/style.css", nil)) + utils.AssertEqual(t, nil, err, "app.Test(req)") + utils.AssertEqual(t, 200, resp.StatusCode, "Status code") + + body, err = io.ReadAll(resp.Body) + utils.AssertEqual(t, nil, err, "app.Test(req)") + utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) +} + +func Test_Route_Static_SubApp(t *testing.T) { + t.Parallel() + + dir := "./.github/testdata/fs/css" + app := New() + + subApp := New() + subApp.Static("/css", dir) + + app.Mount("/sub", subApp) + + resp, err := app.Test(httptest.NewRequest(MethodGet, "/sub/css/style.css", nil)) + utils.AssertEqual(t, nil, err, "app.Test(req)") + utils.AssertEqual(t, 200, resp.StatusCode, "Status code") + + body, err := io.ReadAll(resp.Body) + utils.AssertEqual(t, nil, err, "app.Test(req)") + utils.AssertEqual(t, true, strings.Contains(app.getString(body), "color")) } func Test_Router_NotFound(t *testing.T) {