mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-03-29 06:45:31 +00:00
0aa872c4e3
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/6866
- The middleware that takes care of normalizing `//user2/////repo1` to `/user2/repo1` would only set the normalized value to the Chi (Forgejo's http router) `RoutePath` field, so Chi would correctly do the routing. However not all components in Forgejo (like Forgejo's `context` module) rely on Chi to get this updated path and some still rely on the value of `(http.Request).URL.Path`, so always set the normalized value to the http request.
- Adjusted unit test.
- Resolves forgejo/forgejo#6822
- The related issue was caused by
751a3da979/services/context/context.go (L115)
using the value of the http request on not that was set in the Chi context.
Co-authored-by: Gusted <postmaster@gusted.xyz>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6884
Reviewed-by: Otto <otto@codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
85 lines
2.1 KiB
Go
85 lines
2.1 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
package common
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/modules/web"
|
|
|
|
chi "github.com/go-chi/chi/v5"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestStripSlashesMiddleware(t *testing.T) {
|
|
type test struct {
|
|
name string
|
|
expectedPath string
|
|
inputPath string
|
|
}
|
|
|
|
tests := []test{
|
|
{
|
|
name: "path with multiple slashes",
|
|
inputPath: "https://github.com///go-gitea//gitea.git",
|
|
expectedPath: "/go-gitea/gitea.git",
|
|
},
|
|
{
|
|
name: "path with no slashes",
|
|
inputPath: "https://github.com/go-gitea/gitea.git",
|
|
expectedPath: "/go-gitea/gitea.git",
|
|
},
|
|
{
|
|
name: "path with slashes in the middle",
|
|
inputPath: "https://git.data.coop//halfd/new-website.git",
|
|
expectedPath: "/halfd/new-website.git",
|
|
},
|
|
{
|
|
name: "path with slashes in the middle",
|
|
inputPath: "https://git.data.coop//halfd/new-website.git",
|
|
expectedPath: "/halfd/new-website.git",
|
|
},
|
|
{
|
|
name: "path with slashes in the end",
|
|
inputPath: "/user2//repo1/",
|
|
expectedPath: "/user2/repo1",
|
|
},
|
|
{
|
|
name: "path with slashes in the beginning",
|
|
inputPath: "https://codeberg.org//user2/repo1/",
|
|
expectedPath: "/user2/repo1",
|
|
},
|
|
{
|
|
name: "path with slashes and query params",
|
|
inputPath: "/repo//migrate?service_type=3",
|
|
expectedPath: "/repo/migrate",
|
|
},
|
|
{
|
|
name: "path with encoded slash",
|
|
inputPath: "/user2/%2F%2Frepo1",
|
|
expectedPath: "/user2/%2F%2Frepo1",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
r := web.NewRoute()
|
|
r.Use(stripSlashesMiddleware)
|
|
|
|
called := false
|
|
r.Get("*", func(w http.ResponseWriter, r *http.Request) {
|
|
assert.Equal(t, tt.expectedPath, r.URL.Path)
|
|
|
|
rctx := chi.RouteContext(r.Context())
|
|
assert.Equal(t, tt.expectedPath, rctx.RoutePath)
|
|
|
|
called = true
|
|
})
|
|
|
|
// create a mock request to use
|
|
req := httptest.NewRequest("GET", tt.inputPath, nil)
|
|
r.ServeHTTP(httptest.NewRecorder(), req)
|
|
assert.True(t, called)
|
|
}
|
|
}
|