Skip to content

Commit 917d322

Browse files
committed
simplify AppSubURL handling
1 parent dcf5983 commit 917d322

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

routers/web/repo/view_home.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,8 @@ func Home(ctx *context.Context) {
416416

417417
// HomeRedirect redirects from /tree/* to /src/* in order to maintain a similar URL structure.
418418
func HomeRedirect(ctx *context.Context) {
419-
prefix := "/"
420-
if setting.AppSubURL != "" {
421-
prefix = setting.AppSubURL
422-
}
423-
424419
url := treeRedirectURL(
425-
prefix,
420+
setting.AppSubURL,
426421
ctx.PathParam("username"),
427422
ctx.PathParam("reponame"),
428423
ctx.PathParam("*"),
@@ -436,6 +431,7 @@ func HomeRedirect(ctx *context.Context) {
436431
func treeRedirectURL(prefix, username, reponame, remainder string) string {
437432
return path.Join(
438433
prefix,
434+
"/", // The prefix may be an empty string, so ensure we have a preceding slash
439435
url.PathEscape(username),
440436
url.PathEscape(reponame),
441437
"src",

routers/web/repo/view_home_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ func TestTreeRedirectURL(t *testing.T) {
1919
cases := []testcase{
2020
{
2121
name: "ref",
22-
prefix: "/", username: "user2", reponame: "readme-test", remainder: "main",
22+
prefix: "", username: "user2", reponame: "readme-test", remainder: "main",
2323
expected: "/user2/readme-test/src/main",
2424
},
2525
{
2626
name: "sha",
27-
prefix: "/", username: "user2", reponame: "readme-test", remainder: "fe495ea336f079ef2bed68648d0ba9a37cdbd4aa",
27+
prefix: "", username: "user2", reponame: "readme-test", remainder: "fe495ea336f079ef2bed68648d0ba9a37cdbd4aa",
2828
expected: "/user2/readme-test/src/fe495ea336f079ef2bed68648d0ba9a37cdbd4aa",
2929
},
3030
{
3131
name: "escape",
32-
prefix: "/", username: "user/2%", reponame: "readme/test?", remainder: "$/&",
32+
prefix: "", username: "user/2%", reponame: "readme/test?", remainder: "$/&",
3333
expected: "/user%2F2%25/readme%2Ftest%3F/src/$/&",
3434
},
3535
{

0 commit comments

Comments
 (0)