github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 17:56:34 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "fileserver: Redirect within the original URL (#4179)"

Browse Source 
This reverts commit f9b54454a1.
/cc @diamondburned (see #4205)
This commit is contained in:
Matthew Holt 2021-06-14 09:03:56 -06:00
parent 89aa3a5ef3
commit 8848df9c5d
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/caddyhttp/fileserver/browse.go
View File

@ -47,11 +47,10 @@ func (fsrv *FileServer) serveBrowse(root, dirPath string, w http.ResponseWriter,
// URL doesn't end in a trailing slash because hrefs like // URL doesn't end in a trailing slash because hrefs like
// "/b/c" on a path like "/a" end up going to "/b/c" instead // "/b/c" on a path like "/a" end up going to "/b/c" instead
// of "/a/b/c" - so we have to redirect in this case // of "/a/b/c" - so we have to redirect in this case
oldReq := r.Context().Value(caddyhttp.OriginalRequestCtxKey).(http.Request) if !strings.HasSuffix(r.URL.Path, "/") {
if !strings.HasSuffix(oldReq.URL.Path, "/") { fsrv.logger.Debug("redirecting to trailing slash to preserve hrefs", zap.String("request_path", r.URL.Path))
fsrv.logger.Debug("redirecting to trailing slash to preserve hrefs", zap.String("request_path", oldReq.URL.Path)) r.URL.Path += "/"
oldReq.URL.Path += "/" http.Redirect(w, r, r.URL.String(), http.StatusMovedPermanently)
http.Redirect(w, r, oldReq.URL.String(), http.StatusMovedPermanently)
return nil return nil
} }

14
modules/caddyhttp/fileserver/staticfiles.go
View File

@ -243,14 +243,12 @@ func (fsrv *FileServer) ServeHTTP(w http.ResponseWriter, r *http.Request, next c
// trailing slash - not enforcing this can break relative hrefs // trailing slash - not enforcing this can break relative hrefs
// in HTML (see https://github.com/caddyserver/caddy/issues/2741) // in HTML (see https://github.com/caddyserver/caddy/issues/2741)
if fsrv.CanonicalURIs == nil || *fsrv.CanonicalURIs { if fsrv.CanonicalURIs == nil || *fsrv.CanonicalURIs {
oldReq := r.Context().Value(caddyhttp.OriginalRequestCtxKey).(http.Request) if implicitIndexFile && !strings.HasSuffix(r.URL.Path, "/") {
fsrv.logger.Debug("redirecting to canonical URI (adding trailing slash for directory)", zap.String("path", r.URL.Path))
if implicitIndexFile && !strings.HasSuffix(oldReq.URL.Path, "/") { return redirect(w, r, r.URL.Path+"/")
fsrv.logger.Debug("redirecting to canonical URI (adding trailing slash for directory)", zap.String("path", oldReq.URL.Path)) } else if !implicitIndexFile && strings.HasSuffix(r.URL.Path, "/") {
return redirect(w, r, oldReq.URL.Path+"/") fsrv.logger.Debug("redirecting to canonical URI (removing trailing slash for file)", zap.String("path", r.URL.Path))
} else if !implicitIndexFile && strings.HasSuffix(oldReq.URL.Path, "/") { return redirect(w, r, r.URL.Path[:len(r.URL.Path)-1])
fsrv.logger.Debug("redirecting to canonical URI (removing trailing slash for file)", zap.String("path", oldReq.URL.Path))
return redirect(w, r, oldReq.URL.Path[:len(oldReq.URL.Path)-1])
} }
} }