octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-03-21 10:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make syncthing honor both the ignorePerms and FlagNoPermBits settings (fixes #1871)

Browse Source
This commit is contained in:
Bart De Vries 2015-05-25 12:43:19 +02:00 committed by Jakob Borg
parent 5417fb7287
commit d2205228fb
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/model/rwfolder.go
View File

@ -109,6 +109,13 @@ func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFo
} }
} }
// Helper function to check whether either the ignorePerm flag has been
// set on the local host or the FlagNoPermBits has been set on the file/dir
// which is being pulled.
func (p *rwFolder) ignorePermissions(file protocol.FileInfo) bool {
return p.ignorePerms || file.Flags&protocol.FlagNoPermBits != 0
}
// Serve will run scans and pulls. It will return when Stop()ed or on a // Serve will run scans and pulls. It will return when Stop()ed or on a
// critical error. // critical error.
func (p *rwFolder) Serve() { func (p *rwFolder) Serve() {
@ -540,7 +547,7 @@ func (p *rwFolder) handleDir(file protocol.FileInfo) {
realName := filepath.Join(p.dir, file.Name) realName := filepath.Join(p.dir, file.Name)
mode := os.FileMode(file.Flags & 0777) mode := os.FileMode(file.Flags & 0777)
if p.ignorePerms { if p.ignorePermissions(file) {
mode = 0777 mode = 0777
} }
@ -569,7 +576,7 @@ func (p *rwFolder) handleDir(file protocol.FileInfo) {
// not MkdirAll because the parent should already exist. // not MkdirAll because the parent should already exist.
mkdir := func(path string) error { mkdir := func(path string) error {
err = os.Mkdir(path, mode) err = os.Mkdir(path, mode)
if err != nil || p.ignorePerms { if err != nil || p.ignorePermissions(file) {
return err return err
} }
return os.Chmod(path, mode) return os.Chmod(path, mode)
@ -592,7 +599,7 @@ func (p *rwFolder) handleDir(file protocol.FileInfo) {
// 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 p.ignorePerms { if p.ignorePermissions(file) {
p.dbUpdates <- file p.dbUpdates <- file
} else if err := os.Chmod(realName, mode); err == nil { } else if err := os.Chmod(realName, mode); err == nil {
p.dbUpdates <- file p.dbUpdates <- file
@ -858,7 +865,7 @@ func (p *rwFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocks
copyTotal: len(blocks), copyTotal: len(blocks),
copyNeeded: len(blocks), copyNeeded: len(blocks),
reused: reused, reused: reused,
ignorePerms: p.ignorePerms, ignorePerms: p.ignorePermissions(file),
version: curFile.Version, version: curFile.Version,
mut: sync.NewMutex(), mut: sync.NewMutex(),
} }
@ -878,7 +885,7 @@ func (p *rwFolder) handleFile(file protocol.FileInfo, copyChan chan<- copyBlocks
// thing that has changed. // thing that has changed.
func (p *rwFolder) shortcutFile(file protocol.FileInfo) error { func (p *rwFolder) shortcutFile(file protocol.FileInfo) error {
realName := filepath.Join(p.dir, file.Name) realName := filepath.Join(p.dir, file.Name)
if !p.ignorePerms { if !p.ignorePermissions(file) {
if err := os.Chmod(realName, os.FileMode(file.Flags&0777)); err != nil { if err := os.Chmod(realName, os.FileMode(file.Flags&0777)); err != nil {
l.Infof("Puller (folder %q, file %q): shortcut: chmod: %v", p.folder, file.Name, err) l.Infof("Puller (folder %q, file %q): shortcut: chmod: %v", p.folder, file.Name, err)
return err return err
@ -1076,7 +1083,7 @@ func (p *rwFolder) performFinish(state *sharedPullerState) {
}() }()
// Set the correct permission bits on the new file // Set the correct permission bits on the new file
if !p.ignorePerms { if !p.ignorePermissions(state.file) {
err = os.Chmod(state.tempName, os.FileMode(state.file.Flags&0777)) err = os.Chmod(state.tempName, os.FileMode(state.file.Flags&0777))
if err != nil { if err != nil {
l.Warnln("Puller: final:", err) l.Warnln("Puller: final:", err)