28ac536280
fix: normalize Windows backslash paths in file uploads When uploading files from a Windows client to a Linux server, file paths containing backslashes were not being properly interpreted as directory separators. This caused files intended for subdirectories to be created in the root directory with backslashes in their filenames. Changes: - Add util.CleanWindowsPath and util.CleanWindowsPathBase helper functions in weed/util/fullpath.go for reusable path normalization - Use path.Join/path.Clean/path.Base instead of filepath equivalents for URL path semantics (filepath is OS-specific) - Apply normalization in weed admin handlers and filer upload parsing Fixes #7628
101 lines
2.3 KiB
Go
101 lines
2.3 KiB
Go
package util
|
|
|
|
import (
|
|
"path"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
type FullPath string
|
|
|
|
func NewFullPath(dir, name string) FullPath {
|
|
name = strings.TrimSuffix(name, "/")
|
|
return FullPath(dir).Child(name)
|
|
}
|
|
|
|
func (fp FullPath) DirAndName() (string, string) {
|
|
dir, name := filepath.Split(string(fp))
|
|
name = strings.ToValidUTF8(name, "?")
|
|
if dir == "/" {
|
|
return dir, name
|
|
}
|
|
if len(dir) < 1 {
|
|
return "/", ""
|
|
}
|
|
return dir[:len(dir)-1], name
|
|
}
|
|
|
|
func (fp FullPath) Name() string {
|
|
_, name := filepath.Split(string(fp))
|
|
name = strings.ToValidUTF8(name, "?")
|
|
return name
|
|
}
|
|
|
|
func (fp FullPath) IsLongerFileName(maxFilenameLength uint32) bool {
|
|
if maxFilenameLength == 0 {
|
|
return false
|
|
}
|
|
return uint32(len([]byte(fp.Name()))) > maxFilenameLength
|
|
}
|
|
|
|
func (fp FullPath) Child(name string) FullPath {
|
|
dir := string(fp)
|
|
noPrefix := name
|
|
if strings.HasPrefix(name, "/") {
|
|
noPrefix = name[1:]
|
|
}
|
|
if strings.HasSuffix(dir, "/") {
|
|
return FullPath(dir + noPrefix)
|
|
}
|
|
return FullPath(dir + "/" + noPrefix)
|
|
}
|
|
|
|
// AsInode an in-memory only inode representation
|
|
func (fp FullPath) AsInode(unixTime int64) uint64 {
|
|
inode := uint64(HashStringToLong(string(fp)))
|
|
inode = inode + uint64(unixTime)*37
|
|
return inode
|
|
}
|
|
|
|
// split, but skipping the root
|
|
func (fp FullPath) Split() []string {
|
|
if fp == "" || fp == "/" {
|
|
return []string{}
|
|
}
|
|
return strings.Split(string(fp)[1:], "/")
|
|
}
|
|
|
|
func Join(names ...string) string {
|
|
return filepath.ToSlash(filepath.Join(names...))
|
|
}
|
|
|
|
func JoinPath(names ...string) FullPath {
|
|
return FullPath(Join(names...))
|
|
}
|
|
|
|
func (fp FullPath) IsUnder(other FullPath) bool {
|
|
if other == "/" {
|
|
return true
|
|
}
|
|
return strings.HasPrefix(string(fp), string(other)+"/")
|
|
}
|
|
|
|
func StringSplit(separatedValues string, sep string) []string {
|
|
if separatedValues == "" {
|
|
return nil
|
|
}
|
|
return strings.Split(separatedValues, sep)
|
|
}
|
|
|
|
// CleanWindowsPath normalizes Windows-style backslashes to forward slashes.
|
|
// This handles paths from Windows clients where paths use backslashes.
|
|
func CleanWindowsPath(p string) string {
|
|
return strings.ReplaceAll(p, "\\", "/")
|
|
}
|
|
|
|
// CleanWindowsPathBase normalizes Windows-style backslashes to forward slashes
|
|
// and returns the base name of the path.
|
|
func CleanWindowsPathBase(p string) string {
|
|
return path.Base(strings.ReplaceAll(p, "\\", "/"))
|
|
}
|