mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-25 03:01:47 +00:00
* refactor(command): expand "~" in all path-style CLI flags Many of weed's path-bearing flags (-s3.config, -s3.iam.config, -admin.dataDir, -webdav.cacheDir, -volume.dir.idx, TLS cert/key files, profile output paths, mount cache dirs, sftp key files, ...) were never run through util.ResolvePath, so a value like "~/iam.json" was used literally. Tilde only worked when the shell expanded it, which silently fails for the common -flag=~/path form (bash leaves the tilde literal in --opt=~/path). - Extend util.ResolvePath to also handle "~user" / "~user/rest", matching shell tilde expansion. Add unit tests. - Apply util.ResolvePath at the top of each shared start* function (s3, webdav, sftp) so mini/server/filer/standalone callers all inherit it; resolve at the few one-off use sites (mount cache dirs, volume idx folder, mini admin.dataDir, profile paths). - Drop the duplicate expandHomeDir helper from admin.go in favor of the now-equivalent util.ResolvePath. * fixup: handle comma-separated -dir flags for tilde expansion `weed mini -dir`, `weed server -dir`, and `weed volume -dir` accept comma-separated paths (`dir[,dir]...`). Calling util.ResolvePath on the whole string mishandled multi-folder values with tilde, e.g. "~/d1,~/d2" would resolve as if "d1,~/d2" were a single subpath. - Add util.ResolveCommaSeparatedPaths: split on ",", run each entry through ResolvePath, rejoin. Short-circuits when no "~" present. - Use it for *miniDataFolders (mini.go), *volumeDataFolders (server.go), and resolve each entry of v.folders in-place (volume.go) so all downstream consumers see resolved paths. - Add 7-case TestResolveCommaSeparatedPaths covering empty, single, multiple, and mixed inputs. * address PR review: metaFolder + Windows backslash - master.go: resolve *m.metaFolder at the top of runMaster so util.FullPath(*m.metaFolder) on the next line sees an expanded path. Drop the now-redundant ResolvePath in TestFolderWritable. - server.go: same treatment for *masterOptions.metaFolder, paired with the existing cpu/mem profile resolves. Drop the redundant inner ResolvePath at TestFolderWritable. - file_util.go: ResolvePath now accepts filepath.Separator as a separator after the tilde, so "~\\data" works on Windows. Other platforms keep current behaviour (backslash stays literal because it is a valid filename character in usernames and paths). - file_util_test.go: add two cases using filepath.Separator that exercise the new code path on Windows and remain a no-op on Unix. * address PR review: resolve "~" in remaining command path flags Comprehensive sweep of path-bearing flags across every weed subcommand, applying util.ResolvePath in-place at the top of each run* function so all downstream consumers see expanded paths. - webdav.go: resolve *wo.cacheDir at the top of startWebDav so mini/server/filer/standalone callers all inherit it. - mount_std.go: cpu/mem profile paths. - filer_sync.go: cpu/mem profile paths. - mq_broker.go: cpu/mem profile paths. - benchmark.go: cpuprofile output path. - backup.go: -dir resolved once at runBackup; drop the duplicated inline ResolvePath in NewVolume calls. - compact.go: -dir resolved at runCompact; drop inline ResolvePath. - export.go: -dir and -o resolved at runExport; drop inline ResolvePath in LoadFromIdx and ScanVolumeFile. - download.go: -dir resolved at runDownload; drop inline. - update.go: -dir resolved at runUpdate so filepath.Join uses the expanded path; drop inline ResolvePath in TestFolderWritable. - scaffold.go: -output expanded before filepath.Join. - worker.go: -workingDir expanded before being passed to runtime. * address PR review: resolve option-struct paths at run* entry points server.go:381 propagates s3Options.config to filerOptions.s3ConfigFile *before* startS3Server runs, which meant the filer-side code saw the unresolved tilde-prefixed pointer. Same pattern for webdavOptions and sftpOptions (and equivalent in mini.go / filer.go). The fix: hoist resolution from the shared start* functions up to the run* entry points, where every shared pointer is set up before any propagation happens. - s3.go, webdav.go, sftp.go: extract a resolvePaths() method on each Options struct that runs every path field through util.ResolvePath in-place. Idempotent. - runS3, runWebDav, runSftp: call the standalone struct's resolvePaths before starting metrics / loading security config. - runServer, runMini, runFiler: call resolvePaths on every embedded options struct, plus resolve loose flags (serverIamConfig, miniS3Config, miniIamConfig, miniMasterOptions.metaFolder, and filer's defaultLevelDbDirectory) so they're expanded before any pointer copy or use. - Drop the now-redundant inline ResolvePath at filer's defaultLevelDbDirectory composition. * address PR review: re-resolve mini -dir post-config, cover misc paths - mini.go: applyConfigFileOptions can overwrite -dir with a literal ~/data from mini.options. Re-resolve *miniDataFolders after the config-file apply, alongside the other path resolves, so the mini filer no longer ends up with a literal ~/data/filerldb2. - benchmark.go: resolve *b.idListFile (-list). - filer_sync.go: resolve *syncOptions.aSecurity / .bSecurity (-a.security / -b.security) before LoadClientTLSFromFile. - filer_cat.go: resolve *filerCat.output (-o) before os.OpenFile. - admin.go: drop trailing blank line at EOF (git diff --check). * address PR review: resolve -a.security/-b.security/-config before use Three follow-up fixes: - filer_sync.go: the -a.security / -b.security resolves were placed *after* LoadClientTLSFromFile / LoadHTTPClientFromFile were called, so weed filer.sync -a.security=~/a.toml still passed the literal tilde path. Hoist the resolves above the security-loading block so TLS clients see expanded paths. - filer_sync_verify.go: same flag pair was never resolved at all in the verify command; resolve at the top of runFilerSyncVerify. - filer_meta_backup.go: -config (the backup_filer.toml path) was passed directly to viper. Resolve at the top of runFilerMetaBackup. - mini.go: master.dir defaulted to the entire comma-joined miniDataFolders. With weed mini -dir=~/d1,~/d2 (or any multi-dir setup), TestFolderWritable then stat'd the joined string instead of a single directory. Default to the first entry via StringSplit to mirror the disk-space calculation a few lines below, and drop the now-redundant ResolvePath in TestFolderWritable.
192 lines
4.4 KiB
Go
192 lines
4.4 KiB
Go
package util
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/sha256"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/user"
|
|
"path/filepath"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
)
|
|
|
|
const maxFilenameLength = 255
|
|
|
|
func TestFolderWritable(folder string) (err error) {
|
|
fileInfo, err := os.Stat(folder)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !fileInfo.IsDir() {
|
|
return errors.New("Not a valid folder!")
|
|
}
|
|
perm := fileInfo.Mode().Perm()
|
|
glog.V(0).Infoln("Folder", folder, "Permission:", perm)
|
|
if 0200&perm != 0 {
|
|
return nil
|
|
}
|
|
return errors.New("Not writable!")
|
|
}
|
|
|
|
func GetFileSize(file *os.File) (size int64, err error) {
|
|
var fi os.FileInfo
|
|
if fi, err = file.Stat(); err == nil {
|
|
size = fi.Size()
|
|
}
|
|
return
|
|
}
|
|
|
|
func FileExists(filename string) bool {
|
|
|
|
_, err := os.Stat(filename)
|
|
if os.IsNotExist(err) {
|
|
return false
|
|
}
|
|
return true
|
|
|
|
}
|
|
|
|
func FolderExists(folder string) bool {
|
|
|
|
fileInfo, err := os.Stat(folder)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return fileInfo.IsDir()
|
|
|
|
}
|
|
|
|
func CheckFile(filename string) (exists, canRead, canWrite bool, modTime time.Time, fileSize int64) {
|
|
exists = true
|
|
fi, err := os.Stat(filename)
|
|
if os.IsNotExist(err) {
|
|
exists = false
|
|
return
|
|
}
|
|
if err != nil {
|
|
glog.Errorf("check %s: %v", filename, err)
|
|
return
|
|
}
|
|
if fi.Mode()&0400 != 0 {
|
|
canRead = true
|
|
}
|
|
if fi.Mode()&0200 != 0 {
|
|
canWrite = true
|
|
}
|
|
modTime = fi.ModTime()
|
|
fileSize = fi.Size()
|
|
return
|
|
}
|
|
|
|
// ResolvePath expands a leading "~", "~/", or "~username/" in path to the
|
|
// corresponding home directory, mirroring shell tilde expansion. A path
|
|
// without a leading "~" or whose tilde cannot be resolved is returned
|
|
// unchanged so callers can pass any user-supplied path through this helper
|
|
// without worrying about non-tilde inputs or lookup failures.
|
|
//
|
|
// Forward slashes are always recognised as separators after the tilde;
|
|
// the platform-native separator is also accepted so "~\\data" works on
|
|
// Windows. Backslashes are deliberately not treated as separators on
|
|
// other platforms because they are legal characters in usernames and
|
|
// path segments there.
|
|
func ResolvePath(path string) string {
|
|
|
|
if !strings.HasPrefix(path, "~") {
|
|
return path
|
|
}
|
|
|
|
if path == "~" {
|
|
if usr, err := user.Current(); err == nil {
|
|
return usr.HomeDir
|
|
}
|
|
return path
|
|
}
|
|
|
|
isSep := func(b byte) bool {
|
|
return b == '/' || b == byte(filepath.Separator)
|
|
}
|
|
|
|
if isSep(path[1]) {
|
|
if usr, err := user.Current(); err == nil {
|
|
return filepath.Join(usr.HomeDir, path[2:])
|
|
}
|
|
return path
|
|
}
|
|
|
|
// "~username" or "~username<sep>rest"
|
|
name := path[1:]
|
|
rest := ""
|
|
for i := 0; i < len(name); i++ {
|
|
if isSep(name[i]) {
|
|
rest = name[i+1:]
|
|
name = name[:i]
|
|
break
|
|
}
|
|
}
|
|
usr, err := user.Lookup(name)
|
|
if err != nil {
|
|
return path
|
|
}
|
|
if rest == "" {
|
|
return usr.HomeDir
|
|
}
|
|
return filepath.Join(usr.HomeDir, rest)
|
|
}
|
|
|
|
// ResolveCommaSeparatedPaths splits paths on "," and runs each entry through
|
|
// ResolvePath, then rejoins them. This lets flags like `weed mini -dir` or
|
|
// `weed volume -dir` accept tilde-prefixed entries (e.g. "~/d1,~/d2") even
|
|
// in the comma-separated form the help text advertises.
|
|
func ResolveCommaSeparatedPaths(paths string) string {
|
|
if !strings.Contains(paths, "~") {
|
|
return paths
|
|
}
|
|
parts := strings.Split(paths, ",")
|
|
for i, p := range parts {
|
|
parts[i] = ResolvePath(p)
|
|
}
|
|
return strings.Join(parts, ",")
|
|
}
|
|
|
|
func FileNameBase(filename string) string {
|
|
lastDotIndex := strings.LastIndex(filename, ".")
|
|
if lastDotIndex < 0 {
|
|
return filename
|
|
}
|
|
return filename[:lastDotIndex]
|
|
}
|
|
|
|
func ToShortFileName(path string) string {
|
|
fileName := filepath.Base(path)
|
|
if fileNameBytes := []byte(fileName); len(fileNameBytes) > maxFilenameLength {
|
|
shaStr := fmt.Sprintf("%x", sha256.Sum256(fileNameBytes))
|
|
fileNameBase := FileNameBase(fileName)
|
|
fileExt := fileName[len(fileNameBase):]
|
|
fileNameBaseBates := bytes.ToValidUTF8([]byte(fileNameBase)[:maxFilenameLength-len([]byte(fileExt))-8], []byte{})
|
|
shortFileName := string(fileNameBaseBates) + shaStr[len(shaStr)-8:]
|
|
return filepath.Join(filepath.Dir(path), shortFileName) + fileExt
|
|
}
|
|
return path
|
|
}
|
|
|
|
// Copied from os.WriteFile(), adding file sync.
|
|
// see https://github.com/golang/go/issues/20599
|
|
func WriteFile(name string, data []byte, perm os.FileMode) error {
|
|
f, err := os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = f.Write(data)
|
|
if err1 := f.Sync(); err1 != nil && err == nil {
|
|
err = err1
|
|
}
|
|
if err1 := f.Close(); err1 != nil && err == nil {
|
|
err = err1
|
|
}
|
|
return err
|
|
}
|