Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support sanitising the URL by removing extra slashes in the URL #21333

Merged
merged 18 commits into from
Mar 4, 2023
Merged

Support sanitising the URL by removing extra slashes in the URL #21333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c03b292
Support sanitising the URL by removing extra slashes in the URL
sandyydk Oct 4, 2022
65f2a22
Merge branch 'main' into support-url-slashes
sandyydk Oct 4, 2022
c31a914
Fix linting issues
sandyydk Oct 4, 2022
61a875c
Replace strings split with inbuilt path package
sandyydk Oct 4, 2022
f01d054
Retain backslash suffix
sandyydk Oct 4, 2022
a5b865c
Fix linting comments
sandyydk Oct 4, 2022
9d36d6b
Add more test cases. Replace chi v1 with chi v5
sandyydk Oct 6, 2022
cf24559
Merge branch 'main' into support-url-slashes
sandyydk Oct 6, 2022
dfe8666
Fix inclusion of trailing slash
sandyydk Oct 7, 2022
4ee7fce
Merge branch 'main' into support-url-slashes
sandyydk Oct 7, 2022
6ca6526
Merge branch 'main' into support-url-slashes
zeripath Jan 28, 2023
7fd586d
Merge branch 'main' into support-url-slashes
wolfogre Feb 27, 2023
04b5a90
Apply suggestions from code review
wolfogre Mar 2, 2023
8064d38
Merge branch 'main' into support-url-slashes
wolfogre Mar 2, 2023
e8b5930
Update routers/common/middleware.go
wolfogre Mar 2, 2023
9bb94cd
Merge branch 'main' into support-url-slashes
wolfogre Mar 3, 2023
e9b6d09
Update routers/common/middleware_test.go
wolfogre Mar 3, 2023
58ccfa2
Merge branch 'main' into support-url-slashes
lunny Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add more test cases. Replace chi v1 with chi v5
  • Loading branch information
@sandyydk
sandyydk committed Oct 6, 2022
commit 9d36d6b3a672d36317d881e3241756f88cf2db6d
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ require (
github.com/gliderlabs/ssh v0.3.5
github.com/go-ap/activitypub v0.0.0-20220917143152-e4e7018838c0
github.com/go-ap/jsonld v0.0.0-20220917142617-76bf51585778
github.com/go-chi/chi v1.5.4
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/cors v1.2.1
github.com/go-enry/go-enry/v2 v2.8.2
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,6 @@ github.com/go-ap/jsonld v0.0.0-20220917142617-76bf51585778 h1:0tV3i8tE1NghMC4rXZ
github.com/go-ap/jsonld v0.0.0-20220917142617-76bf51585778/go.mod h1:jyveZeGw5LaADntW+UEsMjl3IlIwk+DxlYNsbofQkGA=
github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
Expand Down
2 changes: 1 addition & 1 deletion routers/common/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"code.gitea.io/gitea/modules/web/routing"

"github.com/chi-middleware/proxy"
"github.com/go-chi/chi"
chi "github.com/go-chi/chi/v5"
)

// Middlewares returns common middlewares
Expand Down
15 changes: 15 additions & 0 deletions routers/common/middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@ func TestStripSlashesMiddleware(t *testing.T) {
inputPath: "https://git.data.coop//halfd/new-website.git",
expectedPath: "https://git.data.coop/halfd/new-website.git",
},
{
name: "path with slashes in the middle",
inputPath: "https://git.data.coop//halfd/new-website.git",
expectedPath: "https://git.data.coop/halfd/new-website.git",
},
{
name: "path with slashes in the end",
inputPath: "/user2//repo1/",
expectedPath: "/user2/repo1/",
},
{
name: "path with slashes and query params",
inputPath: "/repo//migrate?service_type=3",
expectedPath: "/repo/migrate?service_type=3",
},
}

for _, tt := range tests {
Expand Down