reverse: move newDirIVFile into virtualfile.go

After all, is's a virtual file.
This commit is contained in:
Jakob Unterwurzacher 2016-09-28 23:30:13 +02:00
parent 35fb6583e6
commit bce96b5095
3 changed files with 16 additions and 25 deletions

View File

@ -1,25 +0,0 @@
package fusefrontend_reverse
import (
"crypto/sha256"
"github.com/hanwen/go-fuse/fuse"
"github.com/hanwen/go-fuse/fuse/nodefs"
"github.com/rfjakob/gocryptfs/internal/nametransform"
)
// derivePathIV derives an IV from an encrypted path by hashing it
func derivePathIV(path string) []byte {
hash := sha256.Sum256([]byte(path))
return hash[:nametransform.DirIVLen]
}
func (rfs *reverseFS) newDirIVFile(cRelPath string) (nodefs.File, fuse.Status) {
cDir := saneDir(cRelPath)
absDir, err := rfs.abs(rfs.decryptPath(cDir))
if err != nil {
return nil, fuse.ToStatus(err)
}
return rfs.NewVirtualFile(derivePathIV(cDir), absDir)
}

View File

@ -1,6 +1,7 @@
package fusefrontend_reverse
import (
"crypto/sha256"
"encoding/base64"
"path/filepath"
"strings"
@ -18,6 +19,12 @@ func saneDir(path string) string {
return d
}
// derivePathIV derives an IV from an encrypted path by hashing it
func derivePathIV(path string) []byte {
hash := sha256.Sum256([]byte(path))
return hash[:nametransform.DirIVLen]
}
func (rfs *reverseFS) abs(relPath string, err error) (string, error) {
if err != nil {
return "", err

View File

@ -8,6 +8,15 @@ import (
"github.com/hanwen/go-fuse/fuse/nodefs"
)
func (rfs *reverseFS) newDirIVFile(cRelPath string) (nodefs.File, fuse.Status) {
cDir := saneDir(cRelPath)
absDir, err := rfs.abs(rfs.decryptPath(cDir))
if err != nil {
return nil, fuse.ToStatus(err)
}
return rfs.NewVirtualFile(derivePathIV(cDir), absDir)
}
type virtualFile struct {
// Embed nodefs.defaultFile for a ENOSYS implementation of all methods
nodefs.File