fusefrontend: use Fsetxattr/Fgetxattr/etc on all platforms

Darwin now also has these functions, use them. Simplifies
the code and makes it symlink-safe on Darwin as well.

1 files changed, 3 insertions, 75 deletions

diff --git a/internal/fusefrontend/xattr_darwin.go b/internal/fusefrontend/xattr_darwin.go
index c756486..8760480 100644
--- a/internal/fusefrontend/xattr_darwin.go
+++ b/internal/fusefrontend/xattr_darwin.go
@@ -3,86 +3,14 @@
 // Package fusefrontend interfaces directly with the go-fuse library.
 package fusefrontend
 
-import (
-	"path/filepath"
-
-	"github.com/pkg/xattr"
-
-	"github.com/hanwen/go-fuse/fuse"
-
-	"github.com/rfjakob/gocryptfs/internal/tlog"
-)
-
 func disallowedXAttrName(attr string) bool {
 	return false
 }
 
 // On Darwin it is needed to unset XATTR_NOSECURITY 0x0008
 func filterXattrSetFlags(flags int) int {
-	return flags &^ xattr.XATTR_NOSECURITY
-}
-
-// This function is NOT symlink-safe because Darwin lacks
-// both fgetxattr() and /proc/self/fd.
-func (fs *FS) getXattr(relPath string, cAttr string, context *fuse.Context) ([]byte, fuse.Status) {
-	cPath, err := fs.getBackingPath(relPath)
-	if err != nil {
-		return nil, fuse.ToStatus(err)
-	}
-	cData, err := xattr.LGet(cPath, cAttr)
-	if err != nil {
-		return nil, unpackXattrErr(err)
-	}
-	return cData, fuse.OK
-}
-
-// This function is NOT symlink-safe because Darwin lacks
-// both fsetxattr() and /proc/self/fd.
-func (fs *FS) setXattr(relPath string, cAttr string, cData []byte, flags int, context *fuse.Context) fuse.Status {
-	cPath, err := fs.getBackingPath(relPath)
-	if err != nil {
-		return fuse.ToStatus(err)
-	}
-	err = xattr.LSetWithFlags(cPath, cAttr, cData, flags)
-	return unpackXattrErr(err)
-}
-
-// This function is NOT symlink-safe because Darwin lacks
-// both fremovexattr() and /proc/self/fd.
-func (fs *FS) removeXAttr(relPath string, cAttr string, context *fuse.Context) fuse.Status {
-	cPath, err := fs.getBackingPath(relPath)
-	if err != nil {
-		return fuse.ToStatus(err)
-	}
-	err = xattr.LRemove(cPath, cAttr)
-	return unpackXattrErr(err)
-}
-
-// This function is NOT symlink-safe because Darwin lacks
-// both flistxattr() and /proc/self/fd.
-func (fs *FS) listXAttr(relPath string, context *fuse.Context) ([]string, fuse.Status) {
-	cPath, err := fs.getBackingPath(relPath)
-	if err != nil {
-		return nil, fuse.ToStatus(err)
-	}
-	cNames, err := xattr.LList(cPath)
-	if err != nil {
-		return nil, unpackXattrErr(err)
-	}
-	return cNames, fuse.OK
-}
+	// See https://opensource.apple.com/source/xnu/xnu-1504.15.3/bsd/sys/xattr.h.auto.html
+	const XATTR_NOSECURITY = 0x0008
 
-// getBackingPath - get the absolute encrypted path of the backing file
-// from the relative plaintext path "relPath"
-//
-// This function is NOT symlink-safe. Darwin needs it because it lacks
-// fgetxattr(2) and friends.
-func (fs *FS) getBackingPath(relPath string) (string, error) {
-	cPath, err := fs.encryptPath(relPath)
-	if err != nil {
-		return "", err
-	}
-	cAbsPath := filepath.Join(fs.args.Cipherdir, cPath)
-	tlog.Debug.Printf("getBackingPath: %s + %s -> %s", fs.args.Cipherdir, relPath, cAbsPath)
-	return cAbsPath, nil
+	return flags &^ XATTR_NOSECURITY
 }