Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Correctly handle xattrs on directories (fixes #8657) (#8658)

This commit is contained in:
Jakob Borg 2022-11-09 06:54:04 +01:00 committed by GitHub
parent ce2a68622c
commit a523fef78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/model/folder_sendrecv.go
View File

@ -626,8 +626,8 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, snap *db.Snapshot,
return err return err
} }
// Adjust the ownership, if we are supposed to do that. // Set the platform data (ownership, xattrs, etc).
if err := f.maybeAdjustOwnership(&file, path); err != nil { if err := f.setPlatformData(&file, path); err != nil {
return err return err
} }
@ -655,7 +655,7 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, snap *db.Snapshot,
return return
} }
// The directory already exists, so we just correct the mode bits. (We // The directory already exists, so we just correct the metadata. (We
// don't handle modification times on directories, because that sucks...) // don't handle modification times on directories, because that sucks...)
// It's OK to change mode bits on stuff within non-writable directories. // It's OK to change mode bits on stuff within non-writable directories.
if !f.IgnorePerms && !file.NoPermissions { if !f.IgnorePerms && !file.NoPermissions {
@ -663,6 +663,10 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, snap *db.Snapshot,
f.newPullError(file.Name, fmt.Errorf("handling dir (setting permissions): %w", err)) f.newPullError(file.Name, fmt.Errorf("handling dir (setting permissions): %w", err))
return return
} }
if err := f.setPlatformData(&file, file.Name); err != nil {
f.newPullError(file.Name, fmt.Errorf("handling dir (setting metadata): %w", err))
return
}
} }
dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleDir} dbUpdateChan <- dbUpdateJob{file, dbUpdateHandleDir}
} }
@ -753,7 +757,7 @@ func (f *sendReceiveFolder) handleSymlink(file protocol.FileInfo, snap *db.Snaps
if err := f.mtimefs.CreateSymlink(file.SymlinkTarget, path); err != nil { if err := f.mtimefs.CreateSymlink(file.SymlinkTarget, path); err != nil {
return err return err
} }
return f.maybeAdjustOwnership(&file, path) return f.setPlatformData(&file, path)
} }
if err = f.inWritableDir(createLink, file.Name); err == nil { if err = f.inWritableDir(createLink, file.Name); err == nil {
@ -1233,17 +1237,8 @@ func (f *sendReceiveFolder) shortcutFile(file protocol.FileInfo, dbUpdateChan ch
} }
} }
if f.SyncXattrs { if err := f.setPlatformData(&file, file.Name); err != nil {
if err = f.mtimefs.SetXattr(file.Name, file.Platform.Xattrs(), f.XattrFilter); errors.Is(err, fs.ErrXattrsNotSupported) { f.newPullError(file.Name, fmt.Errorf("shortcut file (setting metadata): %w", err))
l.Debugf("Cannot set xattrs on %q: %v", file.Name, err)
} else if err != nil {
f.newPullError(file.Name, fmt.Errorf("shortcut file (setting xattrs): %w", err))
return
}
}
if err := f.maybeAdjustOwnership(&file, file.Name); err != nil {
f.newPullError(file.Name, fmt.Errorf("shortcut file (setting ownership): %w", err))
return return
} }
@ -1612,18 +1607,9 @@ func (f *sendReceiveFolder) performFinish(file, curFile protocol.FileInfo, hasCu
} }
} }
// Set extended attributes // Set file xattrs and ownership.
if f.SyncXattrs { if err := f.setPlatformData(&file, tempName); err != nil {
if err := f.mtimefs.SetXattr(tempName, file.Platform.Xattrs(), f.XattrFilter); errors.Is(err, fs.ErrXattrsNotSupported) { return fmt.Errorf("setting metadata: %w", err)
l.Debugf("Cannot set xattrs on %q: %v", file.Name, err)
} else if err != nil {
return fmt.Errorf("setting xattrs: %w", err)
}
}
// Set ownership based on file metadata or parent, maybe.
if err := f.maybeAdjustOwnership(&file, tempName); err != nil {
return fmt.Errorf("setting ownership: %w", err)
} }
if stat, err := f.mtimefs.Lstat(file.Name); err == nil { if stat, err := f.mtimefs.Lstat(file.Name); err == nil {
@ -2128,7 +2114,19 @@ func (f *sendReceiveFolder) checkToBeDeleted(file, cur protocol.FileInfo, hasCur
return f.scanIfItemChanged(file.Name, stat, cur, hasCur, scanChan) return f.scanIfItemChanged(file.Name, stat, cur, hasCur, scanChan)
} }
func (f *sendReceiveFolder) maybeAdjustOwnership(file *protocol.FileInfo, name string) error { // setPlatformData makes adjustments to the metadata that should happen for
// all types (files, directories, symlinks). This should be one of the last
// things we do to a file when syncing changes to it.
func (f *sendReceiveFolder) setPlatformData(file *protocol.FileInfo, name string) error {
if f.SyncXattrs {
// Set extended attributes.
if err := f.mtimefs.SetXattr(file.Name, file.Platform.Xattrs(), f.XattrFilter); errors.Is(err, fs.ErrXattrsNotSupported) {
l.Debugf("Cannot set xattrs on %q: %v", file.Name, err)
} else if err != nil {
return err
}
}
if f.SyncOwnership { if f.SyncOwnership {
// Set ownership based on file metadata. // Set ownership based on file metadata.
if err := f.syncOwnership(file, name); err != nil { if err := f.syncOwnership(file, name); err != nil {
@ -2140,7 +2138,7 @@ func (f *sendReceiveFolder) maybeAdjustOwnership(file *protocol.FileInfo, name s
return err return err
} }
} }
// Nothing to do
return nil return nil
} }