mirror of
https://codeberg.org/Codeberg/pages-server.git
synced 2024-11-18 10:29:43 +00:00
Add redirect for GitHub-style non-".html" paths & force remove index.html suffix
See https://codeberg.org/Codeberg/Community/issues/547 for more info
This commit is contained in:
parent
026a04e57e
commit
57dce3b0c5
1 changed files with 19 additions and 1 deletions
20
handler.go
20
handler.go
|
@ -444,6 +444,15 @@ func upstream(ctx *fasthttp.RequestCtx, targetOwner string, targetRepo string, t
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// compatibility fix for GitHub Pages (/example → /example.html)
|
||||||
|
optionsForIndexPages.AppendTrailingSlash = false
|
||||||
|
optionsForIndexPages.RedirectIfExists = targetPath + ".html"
|
||||||
|
if upstream(ctx, targetOwner, targetRepo, targetBranch, targetPath + ".html", &optionsForIndexPages) {
|
||||||
|
_ = fileResponseCache.Set(uri+"?timestamp="+strconv.FormatInt(options.BranchTimestamp.Unix(), 10), fileResponse{
|
||||||
|
exists: false,
|
||||||
|
}, FileCacheTimeout)
|
||||||
|
return true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ctx.Response.SetStatusCode(fasthttp.StatusNotFound)
|
ctx.Response.SetStatusCode(fasthttp.StatusNotFound)
|
||||||
if res != nil {
|
if res != nil {
|
||||||
|
@ -460,12 +469,20 @@ func upstream(ctx *fasthttp.RequestCtx, targetOwner string, targetRepo string, t
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Append trailing slash if missing (for index files)
|
// Append trailing slash if missing (for index files), and redirect to fix filenames in general
|
||||||
// options.AppendTrailingSlash is only true when looking for index pages
|
// options.AppendTrailingSlash is only true when looking for index pages
|
||||||
if options.AppendTrailingSlash && !bytes.HasSuffix(ctx.Request.URI().Path(), []byte{'/'}) {
|
if options.AppendTrailingSlash && !bytes.HasSuffix(ctx.Request.URI().Path(), []byte{'/'}) {
|
||||||
ctx.Redirect(string(ctx.Request.URI().Path())+"/", fasthttp.StatusTemporaryRedirect)
|
ctx.Redirect(string(ctx.Request.URI().Path())+"/", fasthttp.StatusTemporaryRedirect)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
if bytes.HasSuffix(ctx.Request.URI().Path(), []byte("/index.html")) {
|
||||||
|
ctx.Redirect(strings.TrimSuffix(string(ctx.Request.URI().Path()), "index.html"), fasthttp.StatusTemporaryRedirect)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if options.RedirectIfExists != "" {
|
||||||
|
ctx.Redirect(options.RedirectIfExists, fasthttp.StatusTemporaryRedirect)
|
||||||
|
return true
|
||||||
|
}
|
||||||
s.Step("error handling")
|
s.Step("error handling")
|
||||||
|
|
||||||
// Set the MIME type
|
// Set the MIME type
|
||||||
|
@ -520,5 +537,6 @@ type upstreamOptions struct {
|
||||||
ForbiddenMimeTypes map[string]struct{}
|
ForbiddenMimeTypes map[string]struct{}
|
||||||
TryIndexPages bool
|
TryIndexPages bool
|
||||||
AppendTrailingSlash bool
|
AppendTrailingSlash bool
|
||||||
|
RedirectIfExists string
|
||||||
BranchTimestamp time.Time
|
BranchTimestamp time.Time
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue