aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-09-04 20:31:06 +0200
committerJakob Unterwurzacher2015-09-04 20:37:37 +0200
commit6f90ec716a0e486628297a8d74e9f4d8d895e744 (patch)
tree66261a242910310edd4db12455de3970ed23e2fb /frontend
parent779ad6dda3d7926c1f68e72600a5db3764e6039d (diff)
Rebase to cluefs
https://github.com/airnandez/cluefs
Diffstat (limited to 'frontend')
-rw-r--r--frontend/dir.go10
-rw-r--r--frontend/file.go4
-rw-r--r--frontend/fs.go29
-rw-r--r--frontend/node.go108
4 files changed, 30 insertions, 121 deletions
diff --git a/frontend/dir.go b/frontend/dir.go
new file mode 100644
index 0000000..4703df9
--- /dev/null
+++ b/frontend/dir.go
@@ -0,0 +1,10 @@
+package frontend
+
+import (
+ //"github.com/rfjakob/gocryptfs/cryptfs"
+ "github.com/rfjakob/cluefs/lib/cluefs"
+)
+
+type Dir struct {
+ *cluefs.Dir
+}
diff --git a/frontend/file.go b/frontend/file.go
index 7b292bd..81590e8 100644
--- a/frontend/file.go
+++ b/frontend/file.go
@@ -2,8 +2,10 @@ package frontend
import (
"github.com/rfjakob/gocryptfs/cryptfs"
+ "github.com/rfjakob/cluefs/lib/cluefs"
)
type File struct {
- cryptfs.File
+ *cryptfs.CryptFile
+ *cluefs.File
}
diff --git a/frontend/fs.go b/frontend/fs.go
index 637d134..ba6ad09 100644
--- a/frontend/fs.go
+++ b/frontend/fs.go
@@ -2,25 +2,26 @@ package frontend
import (
"github.com/rfjakob/gocryptfs/cryptfs"
- "bazil.org/fuse/fs"
+ "github.com/rfjakob/cluefs/lib/cluefs"
)
type FS struct {
- *cryptfs.FS
- backing string
+ *cryptfs.CryptFS
+ *cluefs.ClueFS
}
-func New(key [16]byte, b string) *FS {
- return &FS {
- FS: cryptfs.NewFS(key),
- backing: b,
- }
-}
+type nullTracer struct {}
-func (fs *FS) Root() (fs.Node, error) {
- n := Node{
- backing: "",
- parentFS: fs,
+func (nullTracer) Trace(op cluefs.FsOperTracer) {}
+
+func NewFS(key [16]byte, backing string) *FS {
+ var nt nullTracer
+ clfs, err := cluefs.NewClueFS(backing, nt)
+ if err != nil {
+ panic(err)
+ }
+ return &FS {
+ CryptFS: cryptfs.NewCryptFS(key),
+ ClueFS: clfs,
}
- return n, nil
}
diff --git a/frontend/node.go b/frontend/node.go
index 833be2e..7218d54 100644
--- a/frontend/node.go
+++ b/frontend/node.go
@@ -1,113 +1,9 @@
package frontend
import (
- "fmt"
- "os"
- "time"
- "syscall"
- "io/ioutil"
- "path"
-
- "golang.org/x/net/context"
-
- //"github.com/rfjakob/gocryptfs/cryptfs"
- "bazil.org/fuse"
- "bazil.org/fuse/fs"
+ "github.com/rfjakob/cluefs/lib/cluefs"
)
-
type Node struct {
- fs.NodeRef
- backing string
- parentFS *FS
-}
-
-// FileModeFromStat - create os.FileMode from stat value
-// For some reason, they use different constants.
-// Adapted from https://golang.org/src/os/stat_linux.go
-func FileModeFromStat(st *syscall.Stat_t) os.FileMode {
- fileMode := os.FileMode(st.Mode & 0777)
- switch st.Mode & syscall.S_IFMT {
- case syscall.S_IFBLK:
- fileMode |= os.ModeDevice
- case syscall.S_IFCHR:
- fileMode |= os.ModeDevice | os.ModeCharDevice
- case syscall.S_IFDIR:
- fileMode |= os.ModeDir
- case syscall.S_IFIFO:
- fileMode |= os.ModeNamedPipe
- case syscall.S_IFLNK:
- fileMode |= os.ModeSymlink
- case syscall.S_IFREG:
- // nothing to do
- case syscall.S_IFSOCK:
- fileMode |= os.ModeSocket
- }
- if st.Mode & syscall.S_ISGID != 0 {
- fileMode |= os.ModeSetgid
- }
- if st.Mode & syscall.S_ISUID != 0 {
- fileMode |= os.ModeSetuid
- }
- if st.Mode & syscall.S_ISVTX != 0 {
- fileMode |= os.ModeSticky
- }
- return fileMode
-}
-
-
-func StatToAttr(s *syscall.Stat_t, a *fuse.Attr) {
- a.Inode = s.Ino
- a.Size = uint64(s.Size)
- a.Blocks = uint64(s.Blocks)
- a.Atime = time.Unix(s.Atim.Sec, s.Atim.Nsec)
- a.Mtime = time.Unix(s.Mtim.Sec, s.Mtim.Nsec)
- a.Ctime = time.Unix(s.Ctim.Sec, s.Ctim.Nsec)
- a.Mode = FileModeFromStat(s)
- a.Nlink = uint32(s.Nlink)
- a.Uid = uint32(s.Uid)
- a.Gid = uint32(s.Gid)
- a.Rdev = uint32(s.Rdev)
-}
-
-func (n Node) Attr(ctx context.Context, attr *fuse.Attr) error {
- var err error
- var st syscall.Stat_t
- if n.backing == "" {
- // When GetAttr is called for the toplevel directory, we always want
- // to look through symlinks.
- fmt.Printf("Attr %s\n", n.parentFS.backing)
- //err = syscall.Stat(n.parentFS.backing, &st)
- err = syscall.Stat("/", &st)
- } else {
- fmt.Printf("Attr %s\n", path.Join(n.parentFS.backing, n.backing))
- p := path.Join(n.parentFS.backing, n.backing)
- err = syscall.Lstat(p, &st)
- }
- if err != nil {
- return err
- }
- StatToAttr(&st, attr)
- return nil
-}
-
-func (n *Node) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
- entries, err := ioutil.ReadDir(n.backing)
- if err != nil {
- return nil, err
- }
- var fuseEntries []fuse.Dirent
- for _, e := range entries {
- var d fuse.Dirent
- d.Name = e.Name()
- fuseEntries = append(fuseEntries, d)
- }
- return fuseEntries, err
-}
-
-func (n *Node) Lookup(ctx context.Context, name string) (fs.Node, error) {
- if name == "hello" {
- return Node{}, nil
- }
- return nil, fuse.ENOENT
+ *cluefs.Node
}