From 2b12bba274ba75f76ac8c2af3790e4190b32396f Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Wed, 2 Jan 2019 21:45:40 +0100 Subject: fusefronted: make EncryptPath symlink-safe Finally allows us to delete EncryptPathDirIV. --- internal/fusefrontend/names.go | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'internal/fusefrontend/names.go') diff --git a/internal/fusefrontend/names.go b/internal/fusefrontend/names.go index 36185e2..63f2e84 100644 --- a/internal/fusefrontend/names.go +++ b/internal/fusefrontend/names.go @@ -83,24 +83,3 @@ func (fs *FS) openBackingDir(relPath string) (dirfd int, cName string, err error } return dirfd, cName, nil } - -// encryptPath - encrypt relative plaintext path -// -// TODO: this function is NOT symlink-safe because EncryptPathDirIV is not -// symlink-safe. -func (fs *FS) encryptPath(plainPath string) (string, error) { - if plainPath != "" { // Empty path gets encrypted all the time without actual file accesses. - fs.AccessedSinceLastCheck = 1 - } else { // Empty string gets encrypted as empty string - return plainPath, nil - } - if fs.args.PlaintextNames { - return plainPath, nil - } - - fs.dirIVLock.RLock() - cPath, err := fs.nameTransform.EncryptPathDirIV(plainPath, fs.args.Cipherdir) - tlog.Debug.Printf("encryptPath '%s' -> '%s' (err: %v)", plainPath, cPath, err) - fs.dirIVLock.RUnlock() - return cPath, err -} -- cgit v1.2.3