test-xattr-util: return early if not privileged enough to set trusted.*

diff --git a/src/test/test-xattr-util.c b/src/test/test-xattr-util.c
index 86b72b39e1602592ea2972f1412e028dac1fb179..89915188546e29e4ee1f1055eaacd550ea1fbaa0 100644 (file)
--- a/src/test/test-xattr-util.c
+++ b/src/test/test-xattr-util.c
@@ -7,7 +7,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "capability-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "macro.h"
@@ -94,14 +93,17 @@ static void xattr_symlink_test_one(int fd, const char *path) {
         _cleanup_strv_free_ char **list_split = NULL;
         int r;
 
+        ASSERT_ERROR(xsetxattr_full(fd, path, 0, "trusted.bar", "bogus", SIZE_MAX, XATTR_CREATE), EEXIST);
+
         ASSERT_OK(xsetxattr(fd, path, 0, "trusted.test", "schaffen"));
         ASSERT_OK_EQ(getxattr_at_malloc(fd, path, "trusted.test", 0, &value), (int) STRLEN("schaffen"));
         ASSERT_STREQ(value, "schaffen");
 
         r = listxattr_at_malloc(fd, path, 0, &list);
         ASSERT_OK(r);
-        ASSERT_GE(r, (int) sizeof("trusted.test"));
+        ASSERT_GE(r, (int) sizeof("trusted.test\0trusted.bar"));
         ASSERT_NOT_NULL(list_split = strv_parse_nulstr(list, r));
+        ASSERT_TRUE(strv_contains(list_split, "trusted.bar"));
         ASSERT_TRUE(strv_contains(list_split, "trusted.test"));
 
         ASSERT_OK(xremovexattr(fd, path, 0, "trusted.test"));
@@ -157,19 +159,22 @@ TEST(xsetxattr) {
         fd = safe_close(fd);
 
         /* user.* xattrs are not supported on symlinks. Use trusted.* which requires privilege. */
-        if (have_effective_cap(CAP_SYS_ADMIN) > 0) {
-                ASSERT_OK_ERRNO(symlinkat("empty", dfd, "symlink"));
-                ASSERT_OK_ERRNO(fd = openat(dfd, "symlink", O_NOFOLLOW|O_PATH|O_CLOEXEC));
+        ASSERT_OK_ERRNO(symlinkat("empty", dfd, "symlink"));
+        ASSERT_OK_ERRNO(fd = openat(dfd, "symlink", O_NOFOLLOW|O_PATH|O_CLOEXEC));
+
+        ASSERT_ERROR(xsetxattr(dfd, "symlink", AT_SYMLINK_FOLLOW, "trusted.test", "bogus"), ENOENT);
 
-                ASSERT_ERROR(xsetxattr(dfd, "symlink", AT_SYMLINK_FOLLOW, "trusted.test", "bogus"), ENOENT);
+        r = xsetxattr_full(dfd, "symlink", 0, "trusted.bar", "baz", SIZE_MAX, XATTR_CREATE);
+        if (ERRNO_IS_NEG_PRIVILEGE(r))
+                return (void) log_tests_skipped_errno(r, "Unable to set trusted.* xattr");
+        ASSERT_OK(r);
 
-                xattr_symlink_test_one(dfd, "symlink");
-                xattr_symlink_test_one(fd, NULL);
-                xattr_symlink_test_one(fd, "");
+        xattr_symlink_test_one(dfd, "symlink");
+        xattr_symlink_test_one(fd, NULL);
+        xattr_symlink_test_one(fd, "");
 
-                x = strjoina(t, "/symlink");
-                xattr_symlink_test_one(AT_FDCWD, x);
-        }
+        x = strjoina(t, "/symlink");
+        xattr_symlink_test_one(AT_FDCWD, x);
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);