Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-31 12:15:56 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

browse: Fix symlink indicators for files in folders other than cwd

Browse Source 
Related to #1660 and #1667
This commit is contained in:
Matthew Holt 2017-06-02 17:40:25 -06:00
parent 132f2a9cc3
commit 6b8e40b3fb
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caddyhttp/browse/browse.go
View File

@ -9,6 +9,7 @@ import (
"net/url" "net/url"
"os" "os"
"path" "path"
"path/filepath"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -259,7 +260,7 @@ func directoryListing(files []os.FileInfo, canGoUp bool, urlPath string, config
url := url.URL{Path: "./" + name} // prepend with "./" to fix paths with ':' in the name url := url.URL{Path: "./" + name} // prepend with "./" to fix paths with ':' in the name
fileinfos = append(fileinfos, FileInfo{ fileinfos = append(fileinfos, FileInfo{
IsDir: f.IsDir() || isSymlinkTargetDir(f), IsDir: f.IsDir() || isSymlinkTargetDir(f, urlPath, config),
IsSymlink: isSymlink(f), IsSymlink: isSymlink(f),
Name: f.Name(), Name: f.Name(),
Size: f.Size(), Size: f.Size(),
@ -286,15 +287,19 @@ func isSymlink(f os.FileInfo) bool {
// isSymlinkTargetDir return true if f's symbolic link target // isSymlinkTargetDir return true if f's symbolic link target
// is a directory. Return false if not a symbolic link. // is a directory. Return false if not a symbolic link.
func isSymlinkTargetDir(f os.FileInfo) bool { func isSymlinkTargetDir(f os.FileInfo, urlPath string, config *Config) bool {
if !isSymlink(f) { if !isSymlink(f) {
return false return false
} }
target, err := os.Readlink(f.Name()) fullPath := func(fileName string) string {
fullPath := filepath.Join(string(config.Fs.Root.(http.Dir)), urlPath, fileName)
return filepath.Clean(fullPath)
}
target, err := os.Readlink(fullPath(f.Name()))
if err != nil { if err != nil {
return false return false
} }
targetInfo, err := os.Lstat(target) targetInfo, err := os.Lstat(fullPath(target))
if err != nil { if err != nil {
return false return false
} }