check xattr.Remove errors on macOS (#1351)

cs3org · Dec 2, 2020 · ee561f9 · ee561f9
1 parent d8c6290
commit ee561f9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-xattr-error-darwin.md b/changelog/unreleased/fix-xattr-error-darwin.md
@@ -0,0 +1,5 @@
+Bugfix: Fix xattr.Remove error check for macOS
+
+Previously, we checked the xattr.Remove error only for linux systems. Now macOS is checked also 
+
+https://github.com/cs3org/reva/pull/1351
diff --git a/pkg/storage/fs/ocis/metadata.go b/pkg/storage/fs/ocis/metadata.go
@@ -90,7 +90,9 @@ func (fs *ocisfs) UnsetArbitraryMetadata(ctx context.Context, ref *provider.Refe
 		if err = xattr.Remove(nodePath, attrName); err != nil {
 			// a non-existing attribute will return an error, which we can ignore
 			// (using string compare because the error type is syscall.Errno and not wrapped/recognizable)
-			if e, ok := err.(*xattr.Error); !ok || e.Err.Error() != "no data available" {
+			if e, ok := err.(*xattr.Error); !ok || !(e.Err.Error() == "no data available" ||
+				// darwin
+				e.Err.Error() == "attribute not found") {
 				appctx.GetLogger(ctx).Error().Err(err).
 					Interface("node", n).
 					Str("key", keys[i]).

diff --git a/pkg/storage/fs/ocis/node.go b/pkg/storage/fs/ocis/node.go
@@ -431,7 +431,9 @@ func (n *Node) SetTMTime(t time.Time) (err error) {
 // UnsetTempEtag removes the temporary etag attribute
 func (n *Node) UnsetTempEtag() (err error) {
 	if err = xattr.Remove(n.lu.toInternalPath(n.ID), tmpEtagAttr); err != nil {
-		if e, ok := err.(*xattr.Error); ok && e.Err.Error() == "no data available" {
+		if e, ok := err.(*xattr.Error); ok && (e.Err.Error() == "no data available" ||
+			// darwin
+			e.Err.Error() == "attribute not found") {
 			return nil
 		}
 	}

diff --git a/pkg/storage/fs/owncloud/owncloud.go b/pkg/storage/fs/owncloud/owncloud.go
@@ -1361,7 +1361,9 @@ func (fs *ocfs) UnsetArbitraryMetadata(ctx context.Context, ref *provider.Refere
 			if err = xattr.Remove(ip, mdPrefix+k); err != nil {
 				// a non-existing attribute will return an error, which we can ignore
 				// (using string compare because the error type is syscall.Errno and not wrapped/recognizable)
-				if e, ok := err.(*xattr.Error); !ok || e.Err.Error() != "no data available" {
+				if e, ok := err.(*xattr.Error); !ok || !(e.Err.Error() == "no data available" ||
+					// darwin
+					e.Err.Error() == "attribute not found") {
 					log.Error().Err(err).
 						Str("ipath", ip).
 						Str("key", k).