From 11fb037e7e7d84405b3bed9de2aa500e49d9502d Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sat, 5 Sep 2015 20:30:20 +0200 Subject: Cleanup and rename files --- frontend/checks.go | 31 ----------- frontend/dir.go | 122 ------------------------------------------ frontend/fe_checks.go | 31 +++++++++++ frontend/fe_dir.go | 133 ++++++++++++++++++++++++++++++++++++++++++++++ frontend/fe_file.go | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/fe_fs.go | 47 ++++++++++++++++ frontend/file.go | 133 ---------------------------------------------- frontend/fs.go | 36 ------------- 8 files changed, 355 insertions(+), 322 deletions(-) delete mode 100644 frontend/checks.go delete mode 100644 frontend/dir.go create mode 100644 frontend/fe_checks.go create mode 100644 frontend/fe_dir.go create mode 100644 frontend/fe_file.go create mode 100644 frontend/fe_fs.go delete mode 100644 frontend/file.go delete mode 100644 frontend/fs.go (limited to 'frontend') diff --git a/frontend/checks.go b/frontend/checks.go deleted file mode 100644 index 30720f6..0000000 --- a/frontend/checks.go +++ /dev/null @@ -1,31 +0,0 @@ -package frontend - -import ( - "bazil.org/fuse/fs" -) - -// Compile-time interface checks. -var _ fs.FS = (*FS)(nil) -var _ fs.FSStatfser = (*FS)(nil) - -var _ fs.Node = (*Dir)(nil) -var _ fs.NodeCreater = (*Dir)(nil) -var _ fs.NodeMkdirer = (*Dir)(nil) -var _ fs.NodeRemover = (*Dir)(nil) -var _ fs.NodeRenamer = (*Dir)(nil) -var _ fs.HandleReadDirAller = (*Dir)(nil) - -var _ fs.HandleReader = (*File)(nil) -var _ fs.HandleWriter = (*File)(nil) -var _ fs.Node = (*File)(nil) -var _ fs.NodeOpener = (*File)(nil) -var _ fs.NodeSetattrer = (*File)(nil) - -func foo(h fs.HandleReadDirAller) { - -} - -func init() { - var d Dir - foo(&d) -} diff --git a/frontend/dir.go b/frontend/dir.go deleted file mode 100644 index ee5c474..0000000 --- a/frontend/dir.go +++ /dev/null @@ -1,122 +0,0 @@ -package frontend - -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 { - fmt.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) { - fmt.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) { - fmt.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) { - fmt.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) { - fmt.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 { - fmt.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) { - fmt.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 -} diff --git a/frontend/fe_checks.go b/frontend/fe_checks.go new file mode 100644 index 0000000..30720f6 --- /dev/null +++ b/frontend/fe_checks.go @@ -0,0 +1,31 @@ +package frontend + +import ( + "bazil.org/fuse/fs" +) + +// Compile-time interface checks. +var _ fs.FS = (*FS)(nil) +var _ fs.FSStatfser = (*FS)(nil) + +var _ fs.Node = (*Dir)(nil) +var _ fs.NodeCreater = (*Dir)(nil) +var _ fs.NodeMkdirer = (*Dir)(nil) +var _ fs.NodeRemover = (*Dir)(nil) +var _ fs.NodeRenamer = (*Dir)(nil) +var _ fs.HandleReadDirAller = (*Dir)(nil) + +var _ fs.HandleReader = (*File)(nil) +var _ fs.HandleWriter = (*File)(nil) +var _ fs.Node = (*File)(nil) +var _ fs.NodeOpener = (*File)(nil) +var _ fs.NodeSetattrer = (*File)(nil) + +func foo(h fs.HandleReadDirAller) { + +} + +func init() { + var d Dir + foo(&d) +} diff --git a/frontend/fe_dir.go b/frontend/fe_dir.go new file mode 100644 index 0000000..75b665b --- /dev/null +++ b/frontend/fe_dir.go @@ -0,0 +1,133 @@ +package 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 { + fmt.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) { + fmt.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) { + fmt.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) { + fmt.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) { + fmt.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 { + fmt.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) { + fmt.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 +} diff --git a/frontend/fe_file.go b/frontend/fe_file.go new file mode 100644 index 0000000..4bd623f --- /dev/null +++ b/frontend/fe_file.go @@ -0,0 +1,144 @@ +package frontend + +// frontend sits between FUSE and ClueFS +// and uses cryptfs for all crypto operations +// +// cryptfs +// ^ +// | +// v +// FUSE <-> frontend <-> ClueFS +// +// This file handles files access + +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" +) + +func fixFlags(flags fuse.OpenFlags) (fuse.OpenFlags, bool) { + fmt.Printf("fixFlags: Before: %s\n", flags.String()) + var writeOnly bool + // We always need read access to do read-modify-write cycles + if flags & fuse.OpenWriteOnly > 0 { + flags = flags &^ fuse.OpenWriteOnly + flags = flags | fuse.OpenReadWrite + writeOnly = true + } + // We also cannot open the file in append mode, we need to seek back for RMW + flags = flags &^ fuse.OpenAppend + fmt.Printf("fixFlags: After: %s\n", flags.String()) + return flags, writeOnly +} + +func max(x int, y int) int { + if x > y { + return x + } + return y +} + +type File struct { + *cluefs.File + crfs *cryptfs.CryptFS + // Remember if the file is supposed to be write-only + writeOnly bool +} + +func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fusefs.Handle, error) { + fmt.Printf("File.Open\n") + + req.Flags, f.writeOnly = fixFlags(req.Flags) + + h, err := f.File.Open(ctx, req, resp) + if err != nil { + return nil, err + } + clueFile := h.(*cluefs.File) + return &File { + File: clueFile, + crfs: f.crfs, + }, nil +} + +func (f *File) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error { + iblocks := f.crfs.SplitRange(uint64(req.Offset), uint64(req.Size)) + for _, ib := range iblocks { + var partReq fuse.ReadRequest + var partResp fuse.ReadResponse + o, l := ib.CiphertextRange() + partReq.Offset = int64(o) + partReq.Size = int(l) + partResp.Data = make([]byte, int(l)) + err := f.File.Read(ctx, &partReq, &partResp) + if err != nil { + return err + } + plaintext, err := f.crfs.DecryptBlock(partResp.Data) + if err != nil { + fmt.Printf("Read: Error reading block %d: %s\n", ib.BlockNo, err.Error()) + return err + } + plaintext = ib.CropBlock(plaintext) + resp.Data = append(resp.Data, plaintext...) + } + return nil +} + +func (f *File) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error { + fmt.Printf("File.Write\n") + resp.Size = 0 + iblocks := f.crfs.SplitRange(uint64(req.Offset), uint64(len(req.Data))) + var blockData []byte + for _, ib := range iblocks { + if ib.IsPartial() { + // RMW + blockData = make([]byte, f.crfs.PlainBS()) + var readReq fuse.ReadRequest + var readResp fuse.ReadResponse + o, l := ib.PlaintextRange() + readReq.Offset = int64(o) + readReq.Size = int(l) + err := f.Read(ctx, &readReq, &readResp) + if err != nil { + return err + } + copy(blockData, readResp.Data) + copy(blockData[ib.Offset:ib.Offset+ib.Length], req.Data) + blockLen := max(len(readResp.Data), int(ib.Offset+ib.Length)) + blockData = blockData[0:blockLen] + } else { + blockData = req.Data[0:f.crfs.PlainBS()] + } + ciphertext := f.crfs.EncryptBlock(blockData) + var partReq fuse.WriteRequest + var partResp fuse.WriteResponse + o, _ := ib.CiphertextRange() + partReq.Data = ciphertext + partReq.Offset = int64(o) + err := f.File.Write(ctx, &partReq, &partResp) + if err != nil { + fmt.Printf("Write failure: %s\n", err.Error()) + return err + } + // Remove written data from the front of the request + req.Data = req.Data[len(blockData):len(req.Data)] + resp.Size += len(blockData) + } + return nil +} + +func (f *File) Attr(ctx context.Context, attr *fuse.Attr) error { + fmt.Printf("Attr\n") + err := f.File.Node.Attr(ctx, attr) + if err != nil { + return err + } + attr.Size = f.crfs.PlainSize(attr.Size) + return nil +} diff --git a/frontend/fe_fs.go b/frontend/fe_fs.go new file mode 100644 index 0000000..470095f --- /dev/null +++ b/frontend/fe_fs.go @@ -0,0 +1,47 @@ +package frontend + +// frontend sits between FUSE and ClueFS +// and uses cryptfs for all crypto operations +// +// cryptfs +// ^ +// | +// v +// FUSE <-> frontend <-> ClueFS +// +// This file handles just the root directory + +import ( + "fmt" + "github.com/rfjakob/gocryptfs/cryptfs" + "github.com/rfjakob/cluefs/lib/cluefs" + fusefs "bazil.org/fuse/fs" +) + +type FS struct { + *cryptfs.CryptFS + *cluefs.ClueFS + backing string +} + +type nullTracer struct {} + +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, + backing: backing, + } +} + +func (fs *FS) Root() (fusefs.Node, error) { + fmt.Printf("Root\n") + return NewDir("", fs.backing, fs), nil +} diff --git a/frontend/file.go b/frontend/file.go deleted file mode 100644 index ef74491..0000000 --- a/frontend/file.go +++ /dev/null @@ -1,133 +0,0 @@ -package frontend - -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" -) - -func fixFlags(flags fuse.OpenFlags) (fuse.OpenFlags, bool) { - fmt.Printf("fixFlags: Before: %s\n", flags.String()) - var writeOnly bool - // We always need read access to do read-modify-write cycles - if flags & fuse.OpenWriteOnly > 0 { - flags = flags &^ fuse.OpenWriteOnly - flags = flags | fuse.OpenReadWrite - writeOnly = true - } - // We also cannot open the file in append mode, we need to seek back for RMW - flags = flags &^ fuse.OpenAppend - fmt.Printf("fixFlags: After: %s\n", flags.String()) - return flags, writeOnly -} - -func max(x int, y int) int { - if x > y { - return x - } - return y -} - -type File struct { - *cluefs.File - crfs *cryptfs.CryptFS - // Remember if the file is supposed to be write-only - writeOnly bool -} - -func (f *File) Open(ctx context.Context, req *fuse.OpenRequest, resp *fuse.OpenResponse) (fusefs.Handle, error) { - fmt.Printf("File.Open\n") - - req.Flags, f.writeOnly = fixFlags(req.Flags) - - h, err := f.File.Open(ctx, req, resp) - if err != nil { - return nil, err - } - clueFile := h.(*cluefs.File) - return &File { - File: clueFile, - crfs: f.crfs, - }, nil -} - -func (f *File) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error { - iblocks := f.crfs.SplitRange(uint64(req.Offset), uint64(req.Size)) - for _, ib := range iblocks { - var partReq fuse.ReadRequest - var partResp fuse.ReadResponse - o, l := ib.CiphertextRange() - partReq.Offset = int64(o) - partReq.Size = int(l) - partResp.Data = make([]byte, int(l)) - err := f.File.Read(ctx, &partReq, &partResp) - if err != nil { - return err - } - plaintext, err := f.crfs.DecryptBlock(partResp.Data) - if err != nil { - fmt.Printf("Read: Error reading block %d: %s\n", ib.BlockNo, err.Error()) - return err - } - plaintext = ib.CropBlock(plaintext) - resp.Data = append(resp.Data, plaintext...) - } - return nil -} - -func (f *File) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error { - fmt.Printf("File.Write\n") - resp.Size = 0 - iblocks := f.crfs.SplitRange(uint64(req.Offset), uint64(len(req.Data))) - var blockData []byte - for _, ib := range iblocks { - if ib.IsPartial() { - // RMW - blockData = make([]byte, f.crfs.PlainBS()) - var readReq fuse.ReadRequest - var readResp fuse.ReadResponse - o, l := ib.PlaintextRange() - readReq.Offset = int64(o) - readReq.Size = int(l) - err := f.Read(ctx, &readReq, &readResp) - if err != nil { - return err - } - copy(blockData, readResp.Data) - copy(blockData[ib.Offset:ib.Offset+ib.Length], req.Data) - blockLen := max(len(readResp.Data), int(ib.Offset+ib.Length)) - blockData = blockData[0:blockLen] - } else { - blockData = req.Data[0:f.crfs.PlainBS()] - } - ciphertext := f.crfs.EncryptBlock(blockData) - var partReq fuse.WriteRequest - var partResp fuse.WriteResponse - o, _ := ib.CiphertextRange() - partReq.Data = ciphertext - partReq.Offset = int64(o) - err := f.File.Write(ctx, &partReq, &partResp) - if err != nil { - fmt.Printf("Write failure: %s\n", err.Error()) - return err - } - // Remove written data from the front of the request - req.Data = req.Data[len(blockData):len(req.Data)] - resp.Size += len(blockData) - } - return nil -} - -func (f *File) Attr(ctx context.Context, attr *fuse.Attr) error { - fmt.Printf("Attr\n") - err := f.File.Node.Attr(ctx, attr) - if err != nil { - return err - } - attr.Size = f.crfs.PlainSize(attr.Size) - return nil -} diff --git a/frontend/fs.go b/frontend/fs.go deleted file mode 100644 index 83d1953..0000000 --- a/frontend/fs.go +++ /dev/null @@ -1,36 +0,0 @@ -package frontend - -import ( - "fmt" - "github.com/rfjakob/gocryptfs/cryptfs" - "github.com/rfjakob/cluefs/lib/cluefs" - fusefs "bazil.org/fuse/fs" -) - -type FS struct { - *cryptfs.CryptFS - *cluefs.ClueFS - backing string -} - -type nullTracer struct {} - -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, - backing: backing, - } -} - -func (fs *FS) Root() (fusefs.Node, error) { - fmt.Printf("Root\n") - return NewDir("", fs.backing, fs), nil -} -- cgit v1.2.3