reverse: move newDirIVFile into virtualfile.go
After all, is's a virtual file.
This commit is contained in:
parent
35fb6583e6
commit
bce96b5095
|
@ -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)
|
|
||||||
}
|
|
|
@ -1,6 +1,7 @@
|
||||||
package fusefrontend_reverse
|
package fusefrontend_reverse
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -18,6 +19,12 @@ func saneDir(path string) string {
|
||||||
return d
|
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) {
|
func (rfs *reverseFS) abs(relPath string, err error) (string, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
|
|
|
@ -8,6 +8,15 @@ import (
|
||||||
"github.com/hanwen/go-fuse/fuse/nodefs"
|
"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 {
|
type virtualFile struct {
|
||||||
// Embed nodefs.defaultFile for a ENOSYS implementation of all methods
|
// Embed nodefs.defaultFile for a ENOSYS implementation of all methods
|
||||||
nodefs.File
|
nodefs.File
|
||||||
|
|
Loading…
Reference in New Issue