From 5bd08abf4095fb553355c9b007c8ae4a4314b970 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 4 Oct 2015 14:30:57 +0200 Subject: Remove ClueFS frontend Development has focused on PathFS for some time now and things are working well. --- cluefs_frontend/fe_dir.go | 180 ---------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 cluefs_frontend/fe_dir.go (limited to 'cluefs_frontend/fe_dir.go') diff --git a/cluefs_frontend/fe_dir.go b/cluefs_frontend/fe_dir.go deleted file mode 100644 index 65d92f1..0000000 --- a/cluefs_frontend/fe_dir.go +++ /dev/null @@ -1,180 +0,0 @@ -package cluefs_frontend - -// frontend sits between FUSE and ClueFS -// and uses cryptfs for all crypto operations -// -// cryptfs -// ^ -// | -// v -// FUSE <-> frontend <-> ClueFS -// -// This file handles directories - -import ( - "fmt" - "github.com/rfjakob/gocryptfs/cryptfs" - "github.com/rfjakob/cluefs/lib/cluefs" - "bazil.org/fuse" - fusefs "bazil.org/fuse/fs" - "golang.org/x/net/context" -) - -type Dir struct { - *cluefs.Dir - crfs *cryptfs.CryptFS -} - -func NewDir(parent string, name string, fs *FS) *Dir { - cryptfs.Debug.Printf("NewDir parent=%s name=%s\n", parent, name) - return &Dir { - Dir: cluefs.NewDir(parent, name, fs.ClueFS), - crfs: fs.CryptFS, - } -} - -func (d *Dir) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fusefs.Handle, error) { - cryptfs.Debug.Printf("Open\n") - h, err := d.Dir.Open(ctx, req, resp) - if err != nil { - return nil, err - } - clueDir := h.(*cluefs.Dir) - - return &Dir { - Dir: clueDir, - crfs: d.crfs, - }, nil -} - -func (d *Dir) Lookup(ctx context.Context, req *fuse.LookupRequest, resp *fuse.LookupResponse) (fusefs.Node, error) { - cryptfs.Debug.Printf("Lookup %s\n", req.Name) - req.Name = d.crfs.EncryptPath(req.Name) - node, err := d.Dir.Lookup(ctx, req, resp) - if err != nil { - return nil, err - } - clueDir, ok := node.(*cluefs.Dir) - if ok { - return &Dir { - Dir: clueDir, - crfs: d.crfs, - }, nil - } else { - resp.Attr.Size = d.crfs.PlainSize(resp.Attr.Size) - clueFile := node.(*cluefs.File) - return &File { - File: clueFile, - crfs: d.crfs, - }, nil - } -} - -func (d *Dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { - cryptfs.Debug.Printf("ReadDirAll\n") - entries, err := d.Dir.ReadDirAll(ctx) - if err != nil { - return nil, err - } - var decrypted []fuse.Dirent - for _, e := range entries { - if e.Name == "." || e.Name == ".." { - decrypted = append(decrypted, e) - continue - } - newName, err := d.crfs.DecryptPath(e.Name) - if err != nil { - fmt.Printf("ReadDirAll: Error decoding \"%s\": %s\n", e.Name, err.Error()) - continue - } - e.Name = newName - decrypted = append(decrypted, e) - } - return decrypted, nil -} - -func (d *Dir) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fusefs.Node, error) { - cryptfs.Debug.Printf("Mkdir %s\n", req.Name) - req.Name = d.crfs.EncryptPath(req.Name) - n, err := d.Dir.Mkdir(ctx, req) - if err != nil { - return nil, err - } - clueDir := n.(*cluefs.Dir) - return &Dir { - Dir: clueDir, - crfs: d.crfs, - }, nil -} - -func (d *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { - cryptfs.Debug.Printf("Remove\n") - req.Name = d.crfs.EncryptPath(req.Name) - return d.Dir.Remove(ctx, req) -} - -func (d *Dir) Create(ctx context.Context, req *fuse.CreateRequest, resp *fuse.CreateResponse) (fusefs.Node, fusefs.Handle, error) { - cryptfs.Debug.Printf("Create\n") - req.Flags, _ = fixFlags(req.Flags) - req.Name = d.crfs.EncryptPath(req.Name) - n, _, err := d.Dir.Create(ctx, req, resp) - if err != nil { - return nil, nil, err - } - clueFile := n.(*cluefs.File) - cryptFile := &File { - File: clueFile, - crfs: d.crfs, - } - return cryptFile, cryptFile, nil -} -func (d *Dir) Symlink(ctx context.Context, req *fuse.SymlinkRequest) (fusefs.Node, error) { - req.Target = d.crfs.EncryptPath(req.Target) - req.NewName = d.crfs.EncryptPath(req.NewName) - node, err := d.Dir.Symlink(ctx, req) - if err != nil { - return nil, err - } - - clueDir, ok := node.(*cluefs.Dir) - if ok { - return &Dir { - Dir: clueDir, - crfs: d.crfs, - }, nil - } else { - clueFile := node.(*cluefs.File) - return &File { - File: clueFile, - crfs: d.crfs, - }, nil - } -} -// We need to overwrite Readlink for both Dir and File. Do both right here to keep them in sync. -func (d *Dir) Readlink(ctx context.Context, req *fuse.ReadlinkRequest) (string, error) { - dest, err := d.Dir.Readlink(ctx, req) - if err != nil { - return "", err - } - return d.crfs.DecryptPath(dest) -} -func (d *File) Readlink(ctx context.Context, req *fuse.ReadlinkRequest) (string, error) { - dest, err := d.File.Readlink(ctx, req) - if err != nil { - return "", err - } - return d.crfs.DecryptPath(dest) -} -// We need to overwrite Rename for both Dir and File. Do both right here to keep them in sync. -func (d *Dir) Rename(ctx context.Context, req *fuse.RenameRequest, newDir fusefs.Node) error { - req.OldName = d.crfs.EncryptPath(req.OldName) - req.NewName = d.crfs.EncryptPath(req.NewName) - destDir := newDir.(*Dir) - return d.Dir.Rename(ctx, req, destDir.Dir) -} -func (d *File) Rename(ctx context.Context, req *fuse.RenameRequest, newDir fusefs.Node) error { - req.OldName = d.crfs.EncryptPath(req.OldName) - req.NewName = d.crfs.EncryptPath(req.NewName) - destDir := newDir.(*Dir) - return d.File.Rename(ctx, req, destDir.Dir) -} -- cgit v1.2.3