Skip to content

Commit

Permalink
Don't try to copy files over themselves
Browse files Browse the repository at this point in the history
When copying a config module, make sure the full path for src and dst
files don't match, and also check the inode in case we resolved a
different path to the same file.

Make a note about the unsafe usage of reusing a tempDir path.
  • Loading branch information
jbardin committed Jun 22, 2016
1 parent f4d16a0 commit 556e653
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 3 deletions.
44 changes: 41 additions & 3 deletions config/module/copy_dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os"
"path/filepath"
"strings"
"syscall"
)

// copyDir copies the src directory contents into dst. Both directories
Expand All @@ -19,9 +20,6 @@ func copyDir(dst, src string) error {
if err != nil {
return err
}
if path == src {
return nil
}

if strings.HasPrefix(filepath.Base(path), ".") {
// Skip any dot files
Expand All @@ -36,6 +34,19 @@ func copyDir(dst, src string) error {
// destination with the path without the src on it.
dstPath := filepath.Join(dst, path[len(src):])

// we don't want to try and copy the same file over itself.
if path == dstPath {
return nil
}

// We still might have the same file through a link, so check the
// inode if we can
if eq, err := sameInode(path, dstPath); eq {
return nil
} else if err != nil {
return err
}

// If we have a directory, make that subdirectory, then continue
// the walk.
if info.IsDir() {
Expand Down Expand Up @@ -74,3 +85,30 @@ func copyDir(dst, src string) error {

return filepath.Walk(src, walkFn)
}

// sameInode looks up the inode for paths a and b and returns if they are equal.
// On windows this will always return false.
func sameInode(a, b string) (bool, error) {
var aIno, bIno uint64
aStat, err := os.Stat(a)
if err != nil {
return false, err
}
if st, ok := aStat.Sys().(*syscall.Stat_t); ok {
aIno = st.Ino
}

bStat, err := os.Stat(b)
if err != nil {
return false, err
}
if st, ok := bStat.Sys().(*syscall.Stat_t); ok {
bIno = st.Ino
}

if aIno > 0 && bIno > 0 && aIno == bIno {
return true, nil
}

return false, nil
}
2 changes: 2 additions & 0 deletions config/module/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ func GetCopy(dst, src string) error {
if err != nil {
return err
}
// FIXME: This isn't completely safe. Creating and removing our temp path
// exposes where to race to inject files.
if err := os.RemoveAll(tmpDir); err != nil {
return err
}
Expand Down

0 comments on commit 556e653

Please sign in to comment.