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

fs: only mkdir and chown if not exists

Browse Source
This commit is contained in:
Matthew Penner 2021-02-10 13:56:48 -07:00
parent 683c766d0f
commit 5c56ddf5d6
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/filesystem/filesystem.go
View File

@ -92,6 +92,8 @@ func (fs *Filesystem) Touch(p string, flag int) (*os.File, error) {
if !errors.Is(err, os.ErrNotExist) { if !errors.Is(err, os.ErrNotExist) {
return nil, errors.Wrap(err, "server/filesystem: touch: failed to open file handle") return nil, errors.Wrap(err, "server/filesystem: touch: failed to open file handle")
} }
// Only create and chown the directory if it doesn't exist.
if _, err := os.Stat(filepath.Dir(cleaned)); errors.Is(err, os.ErrNotExist) {
// Create the path leading up to the file we're trying to create, setting the final perms // Create the path leading up to the file we're trying to create, setting the final perms
// on it as we go. // on it as we go.
if err := os.MkdirAll(filepath.Dir(cleaned), 0755); err != nil { if err := os.MkdirAll(filepath.Dir(cleaned), 0755); err != nil {
@ -100,6 +102,7 @@ func (fs *Filesystem) Touch(p string, flag int) (*os.File, error) {
if err := fs.Chown(filepath.Dir(cleaned)); err != nil { if err := fs.Chown(filepath.Dir(cleaned)); err != nil {
return nil, err return nil, err
} }
}
o := &fileOpener{} o := &fileOpener{}
// Try to open the file now that we have created the pathing necessary for it, and then // Try to open the file now that we have created the pathing necessary for it, and then
// Chown that file so that the permissions don't mess with things. // Chown that file so that the permissions don't mess with things.
@ -154,8 +157,8 @@ func (fs *Filesystem) Writefile(p string, r io.Reader) error {
return err return err
} }
// Touch the file and return the handle to it at this point. This will create the file // Touch the file and return the handle to it at this point. This will create the file,
// and any necessary directories as needed. // any necessary directories, and set the proper owner of the file.
file, err := fs.Touch(cleaned, os.O_RDWR|os.O_CREATE|os.O_TRUNC) file, err := fs.Touch(cleaned, os.O_RDWR|os.O_CREATE|os.O_TRUNC)
if err != nil { if err != nil {
return err return err
@ -168,8 +171,6 @@ func (fs *Filesystem) Writefile(p string, r io.Reader) error {
// Adjust the disk usage to account for the old size and the new size of the file. // Adjust the disk usage to account for the old size and the new size of the file.
fs.addDisk(sz - currentSize) fs.addDisk(sz - currentSize)
// Finally, chown the file to ensure the permissions don't end up out-of-whack
// if we had just created it.
return fs.Chown(cleaned) return fs.Chown(cleaned)
} }
@ -249,7 +250,7 @@ func (fs *Filesystem) Chown(path string) error {
err = godirwalk.Walk(cleaned, &godirwalk.Options{ err = godirwalk.Walk(cleaned, &godirwalk.Options{
Unsorted: true, Unsorted: true,
Callback: func(p string, e *godirwalk.Dirent) error { Callback: func(p string, e *godirwalk.Dirent) error {
// Do not attempt to chmod a symlink. Go's os.Chown function will affect the symlink // Do not attempt to chown a symlink. Go's os.Chown function will affect the symlink
// so if it points to a location outside the data directory the user would be able to // so if it points to a location outside the data directory the user would be able to
// (un)intentionally modify that files permissions. // (un)intentionally modify that files permissions.
if e.IsSymlink() { if e.IsSymlink() {

8
server/install.go
View File

@ -48,7 +48,7 @@ func (s *Server) Install(sync bool) error {
s.Log().Info("server configured to skip running installation scripts for this egg, not executing process") s.Log().Info("server configured to skip running installation scripts for this egg, not executing process")
} }
s.Log().Debug("notifying panel of server install state") s.Log().WithField("was_successful", err == nil).Debug("notifying panel of server install state")
if serr := s.SyncInstallState(err == nil); serr != nil { if serr := s.SyncInstallState(err == nil); serr != nil {
l := s.Log().WithField("was_successful", err == nil) l := s.Log().WithField("was_successful", err == nil)
@ -186,15 +186,15 @@ func (ip *InstallationProcess) Run() error {
return err return err
} }
cid, err := ip.Execute() cID, err := ip.Execute()
if err != nil { if err != nil {
ip.RemoveContainer() _ = ip.RemoveContainer()
return err return err
} }
// If this step fails, log a warning but don't exit out of the process. This is completely // If this step fails, log a warning but don't exit out of the process. This is completely
// internal to the daemon's functionality, and does not affect the status of the server itself. // internal to the daemon's functionality, and does not affect the status of the server itself.
if err := ip.AfterExecute(cid); err != nil { if err := ip.AfterExecute(cID); err != nil {
ip.Server.Log().WithField("error", err).Warn("failed to complete after-execute step of installation process") ip.Server.Log().WithField("error", err).Warn("failed to complete after-execute step of installation process")
} }