TrueCloudLab/restic
16
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request #908 from restic/handle-nested-mountpoints

Browse source 
Check allowed devices per path
This commit is contained in:
Alexander Neumann 2017-04-13 22:00:10 +02:00
commit 94441dcbee
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/cmds/restic/cmd_backup.go
View file

@ -220,8 +220,8 @@ func filterExisting(items []string) (result []string, err error) {
// gatherDevices returns the set of unique device ids of the files and/or // gatherDevices returns the set of unique device ids of the files and/or
// directory paths listed in "items". // directory paths listed in "items".
func gatherDevices(items []string) (deviceMap map[uint64]struct{}, err error) { func gatherDevices(items []string) (deviceMap map[string]uint64, err error) {
deviceMap = make(map[uint64]struct{}) deviceMap = make(map[string]uint64)
for _, item := range items { for _, item := range items {
fi, err := fs.Lstat(item) fi, err := fs.Lstat(item)
if err != nil { if err != nil {
@ -231,7 +231,7 @@ func gatherDevices(items []string) (deviceMap map[uint64]struct{}, err error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
deviceMap[id] = struct{}{} deviceMap[item] = id
} }
if len(deviceMap) == 0 { if len(deviceMap) == 0 {
return nil, errors.New("zero allowed devices") return nil, errors.New("zero allowed devices")
@ -352,7 +352,7 @@ func runBackup(opts BackupOptions, gopts GlobalOptions, args []string) error {
} }
// allowed devices // allowed devices
var allowedDevs map[uint64]struct{} var allowedDevs map[string]uint64
if opts.ExcludeOtherFS { if opts.ExcludeOtherFS {
allowedDevs, err = gatherDevices(target) allowedDevs, err = gatherDevices(target)
if err != nil { if err != nil {
@ -444,13 +444,24 @@ func runBackup(opts BackupOptions, gopts GlobalOptions, args []string) error {
// errored out earlier. If it still does that's a reason to panic. // errored out earlier. If it still does that's a reason to panic.
panic(err) panic(err)
} }
_, found := allowedDevs[id]
if !found { for dir := item; dir != ""; dir = filepath.Dir(dir) {
debug.Log("path %q on disallowed device %d", item, id) debug.Log("item %v, test dir %v", item, dir)
return false
allowedID, ok := allowedDevs[dir]
if !ok {
continue
}
if allowedID != id {
debug.Log("path %q on disallowed device %d", item, id)
return false
}
return true
} }
return true panic(fmt.Sprintf("item %v, device id %v not found, allowedDevs: %v", item, id, allowedDevs))
} }
stat, err := archiver.Scan(target, selectFilter, newScanProgress(gopts)) stat, err := archiver.Scan(target, selectFilter, newScanProgress(gopts))