serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-05 08:38:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fileserver: Fix "go up" links in browse listings (closes #3942)

Browse source 
At some point we changed how paths are represented down the function calls of browse listings and forgot to update the canGoUp logic. I think this is right? It's simpler now.
This commit is contained in:
Matthew Holt 2020-12-30 08:03:33 -07:00
parent 38a83ca6f8
commit d8bcf5be4e
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/fileserver/browse.go
View file

@ -99,9 +99,8 @@ func (fsrv *FileServer) loadDirectoryContents(dir *os.File, root, urlPath string
return browseListing{}, err return browseListing{}, err
} }
// determine if user can browse up another folder // user can presumably browse "up" to parent folder if path is longer than "/"
curPathDir := path.Dir(strings.TrimSuffix(urlPath, "/")) canGoUp := len(urlPath) > 1
canGoUp := strings.HasPrefix(curPathDir, root)
return fsrv.directoryListing(files, canGoUp, root, urlPath, repl), nil return fsrv.directoryListing(files, canGoUp, root, urlPath, repl), nil
} }