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

reverse: fix GetAttr for gocryptfs.conf 

And also don't return the encrypted version of
.gocryptfs.reverse.conf in readdir.
This commit is contained in:
Jakob Unterwurzacher 2016-09-20 20:59:02 +02:00
parent 5fb6c5cf58
commit d1762c5b95
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/fusefrontend_reverse/rfs.go
View File

@ -101,6 +101,9 @@ func isDirIV(relPath string) bool {
// GetAttr - FUSE call
func (rfs *reverseFS) GetAttr(relPath string, context *fuse.Context) (*fuse.Attr, fuse.Status) {
if relPath == configfile.ConfDefaultName {
return rfs.loopbackfs.GetAttr(configfile.ConfReverseName, context)
}
if isDirIV(relPath) {
return rfs.dirIVAttr(relPath, context)
}
@ -174,18 +177,15 @@ func (rfs *reverseFS) OpenDir(cipherPath string, context *fuse.Context) ([]fuse.
// Encrypt names
dirIV := deriveDirIV(cipherPath)
for i := range entries {
entries[i].Name = rfs.nameTransform.EncryptName(entries[i].Name, dirIV)
// ".gocryptfs.reverse.conf" in the root directory is mapped to "gocryptfs.conf"
if cipherPath == "" && entries[i].Name == configfile.ConfReverseName {
entries[i].Name = configfile.ConfDefaultName
} else {
entries[i].Name = rfs.nameTransform.EncryptName(entries[i].Name, dirIV)
}
}
// Add virtual gocryptfs.diriv
entries = append(entries, fuse.DirEntry{syscall.S_IFREG | 0400, nametransform.DirIVFilename})
// Add gocryptfs.conf in the root directory,
// maps to .gocryptfs.reverse.conf in the plaintext directory.
if cipherPath == "" {
_, err = os.Stat(filepath.Join(rfs.args.Cipherdir, configfile.ConfReverseName))
if err == nil {
entries = append(entries, fuse.DirEntry{syscall.S_IFREG | 0400, configfile.ConfDefaultName})
}
}
return entries, fuse.OK
}