hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fusefrontend: use openBackingDir in ctlsock interface

Browse Source 
Instead of calling syscall.Open() ourselves, rely on
openBackingDir().
This commit is contained in:
Jakob Unterwurzacher 2018-11-04 21:27:13 +01:00
parent 0c1ceed1fa
commit 8586a83825
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/fusefrontend/ctlsock_interface.go
View File

@ -14,13 +14,18 @@ import (
var _ ctlsock.Interface = &FS{} // Verify that interface is implemented.
// EncryptPath implements ctlsock.Backend
//
// TODO: this function is NOT symlink-safe.
func (fs *FS) EncryptPath(plainPath string) (string, error) {
return fs.encryptPath(plainPath)
}
// DecryptPath implements ctlsock.Backend
//
// DecryptPath is symlink-safe because openBackingDir() and decryptPathAt()
// are symlink-safe.
func (fs *FS) DecryptPath(cipherPath string) (plainPath string, err error) {
dirfd, err := syscall.Open(fs.args.Cipherdir, syscall.O_RDONLY, 0)
dirfd, _, err := fs.openBackingDir("")
if err != nil {
return "", err
}
@ -29,6 +34,8 @@ func (fs *FS) DecryptPath(cipherPath string) (plainPath string, err error) {
}
// decryptPathAt decrypts a ciphertext path relative to dirfd.
//
// Symlink-safe through ReadDirIVAt() and ReadLongNameAt().
func (fs *FS) decryptPathAt(dirfd int, cipherPath string) (plainPath string, err error) {
if fs.args.PlaintextNames || cipherPath == "" {
return cipherPath, nil