MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chown directories, not just files

Browse Source
This commit is contained in:
Matthew Penner 2020-02-02 14:41:15 -07:00
parent 3f6b0ce44c
commit 07b1876954
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/filesystem.go
View File

@ -66,7 +66,7 @@ func (fs *Filesystem) SafePath(p string) (string, error) {
// Range over all of the path parts and form directory pathings from the end // Range over all of the path parts and form directory pathings from the end
// moving up until we have a valid resolution or we run out of paths to try. // moving up until we have a valid resolution or we run out of paths to try.
for k := range parts { for k := range parts {
try = strings.Join(parts[:(len(parts) - k)], "/") try = strings.Join(parts[:(len(parts)-k)], "/")
if !strings.HasPrefix(try, fs.Path()) { if !strings.HasPrefix(try, fs.Path()) {
break break
@ -130,7 +130,7 @@ func (fs *Filesystem) HasSpaceAvailable() bool {
if size, err := fs.DirectorySize("/"); err != nil { if size, err := fs.DirectorySize("/"); err != nil {
zap.S().Warnw("failed to determine directory size", zap.String("server", fs.Server.Uuid), zap.Error(err)) zap.S().Warnw("failed to determine directory size", zap.String("server", fs.Server.Uuid), zap.Error(err))
} else { } else {
fs.Server.Cache.Set("disk_used", size, time.Second * 60) fs.Server.Cache.Set("disk_used", size, time.Second*60)
} }
} }
@ -373,6 +373,9 @@ func (fs *Filesystem) chownDirectory(path string) error {
return errors.WithStack(err) return errors.WithStack(err)
} }
// Chown the directory itself.
os.Chown(cleaned, config.Get().System.User.Uid, config.Get().System.User.Gid)
files, err := ioutil.ReadDir(cleaned) files, err := ioutil.ReadDir(cleaned)
if err != nil { if err != nil {
return errors.WithStack(err) return errors.WithStack(err)
@ -387,6 +390,7 @@ func (fs *Filesystem) chownDirectory(path string) error {
fs.chownDirectory(p) fs.chownDirectory(p)
}(filepath.Join(cleaned, f.Name())) }(filepath.Join(cleaned, f.Name()))
} else { } else {
// Chown the file.
os.Chown(filepath.Join(cleaned, f.Name()), fs.Configuration.User.Uid, fs.Configuration.User.Gid) os.Chown(filepath.Join(cleaned, f.Name()), fs.Configuration.User.Uid, fs.Configuration.User.Gid)
} }
} }
@ -567,4 +571,4 @@ func (fs *Filesystem) EnsureDataDirectory() error {
} }
return nil return nil
} }