shell-completion/zsh/_sd_bus_address

@@ -1,50 +0,0 @@
-#compdef -value-,DBUS_SESSION_BUS_ADDRESS,-default- -value-,DBUS_SYSTEM_BUS_ADDRESS,-default-
-
-local context state state_descr line
-typeset -A val_args
-
-_values -S: kind \
-	'unix[a unix domain socket]:unix properties:->unix' \
-	'tcp[a tcp socket]:tcp properties:->tcp' \
-	'unixexec[a process]:unixexec properties:->unixexec' \
-	'x-machine-unix[a container]:machine properties:->x-machine-unix'
-
-_sd_bus_get_guid() {
-	local TYPE VALUE
-	local -a busname=(org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus)
-
-	_call_program -l dbus-guid busctl call $busname GetId |
-	while read TYPE VALUE; do
-		[[ $TYPE == 's' && -n $VALUE ]] && compadd "$@" - ${(Q)VALUE};
-	done
-}
-
-local expl ret
-case $context in
-	unix)
-		_values -s, 'unix socket properties' \
-			'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-			'(abstract)path[unix domain socket path]:path:_files -r, -g "*(=)"' \
-			'(path)abstract[unix domain socket path in the abstract namespace]:abstract path:_files -r, -P@ -g "*(=)"' \
-			'uid[unix uid]:uid:_numbers' \
-			'gid[unix gid]:gid:_numbers'
-		;;
-	tcp)
-		_values -s, 'unix socket properties' \
-			'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-			'host[hostname]:hostname:_hosts -r,'\
-			'port[port]:port:_numbers' \
-			'family[address family]:address family:(ipv4 ipv6)'
-		;;
-	unixexec)
-		_values -s, 'unixexec properties' \
-			'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-			'path[command path]:command path:_absolute_command_paths -r,'\
-		;;
-	x-machine-unix)
-		_values -s, 'machine properties' \
-			'guid[bus guid]:bus guid:_sd_bus_get_guid -qS,' \
-			'(pid)machine[machine]:machine:_call_function ret _sd_machines' \
-			'(machine)pid[pid]:pid:_pids'
-		;;
-esac

shell-completion/zsh/meson.build

@@ -24,7 +24,6 @@ items = [['_busctl',                   ''],
          ['_udevadm',                  ''],
          ['_varlinkctl',               ''],
          ['_kernel-install',           'ENABLE_KERNEL_INSTALL'],
-         ['_sd_bus_address',           ''],
          ['_sd_hosts_or_user_at_host', ''],
          ['_sd_outputmodes',           ''],
          ['_sd_unit_files',            ''],

src/dissect/dissect.c

@@ -2006,8 +2006,8 @@ static int action_discover(void) {
                                 TABLE_SET_COLOR, startswith(img->name, ".") ? ANSI_GREY : NULL,
                                 TABLE_STRING, image_type_to_string(img->type),
                                 TABLE_STRING, image_class_to_string(img->class),
-                                TABLE_BOOLEAN, image_is_read_only(img),
+                                TABLE_BOOLEAN, img->read_only,
-                                TABLE_SET_COLOR, image_is_read_only(img) ? ANSI_HIGHLIGHT_RED : ANSI_HIGHLIGHT_GREEN,
+                                TABLE_SET_COLOR, !img->read_only ? ANSI_HIGHLIGHT_GREEN : ANSI_HIGHLIGHT_RED,
                                 TABLE_PATH, img->path,
                                 TABLE_TIMESTAMP, img->mtime != 0 ? img->mtime : img->crtime,
                                 TABLE_SIZE, img->usage,

src/import/importd.c

@@ -1365,7 +1365,7 @@ static int method_list_images(sd_bus_message *msg, void *userdata, sd_bus_error
                                         i->name,
                                         image_type_to_string(i->type),
                                         i->path,
-                                        image_is_read_only(i),
+                                        i->read_only,
                                         i->crtime,
                                         i->mtime,
                                         i->usage,

src/machine/image-dbus.c

@@ -24,20 +24,6 @@
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType);
 
-static int property_get_read_only(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        Image *image = ASSERT_PTR(userdata);
-
-        return sd_bus_message_append(ASSERT_PTR(reply), "b", image_is_read_only(image));
-}
-
 int bus_image_method_remove(
                 sd_bus_message *message,
                 void *userdata,
@@ -462,7 +448,7 @@ const sd_bus_vtable image_vtable[] = {
         SD_BUS_PROPERTY("Name", "s", NULL, offsetof(Image, name), 0),
         SD_BUS_PROPERTY("Path", "s", NULL, offsetof(Image, path), 0),
         SD_BUS_PROPERTY("Type", "s", property_get_type,  offsetof(Image, type), 0),
-        SD_BUS_PROPERTY("ReadOnly", "b", property_get_read_only, 0, 0),
+        SD_BUS_PROPERTY("ReadOnly", "b", bus_property_get_bool, offsetof(Image, read_only), 0),
         SD_BUS_PROPERTY("CreationTimestamp", "t", NULL, offsetof(Image, crtime), 0),
         SD_BUS_PROPERTY("ModificationTimestamp", "t", NULL, offsetof(Image, mtime), 0),
         SD_BUS_PROPERTY("Usage", "t", NULL, offsetof(Image, usage), 0),

src/machine/machined-dbus.c

@@ -823,7 +823,7 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er
                 r = sd_bus_message_append(reply, "(ssbttto)",
                                           image->name,
                                           image_type_to_string(image->type),
-                                          image_is_read_only(image),
+                                          image->read_only,
                                           image->crtime,
                                           image->mtime,
                                           image->usage,

src/machine/machined-varlink.c

@@ -638,7 +638,7 @@ static int list_image_one_and_maybe_read_metadata(Manager *m, sd_varlink *link,
                         JSON_BUILD_PAIR_STRING_NON_EMPTY("path", image->path),
                         SD_JSON_BUILD_PAIR_STRING("type", image_type_to_string(image->type)),
                         SD_JSON_BUILD_PAIR_STRING("class", image_class_to_string(image->class)),
-                        SD_JSON_BUILD_PAIR_BOOLEAN("readOnly", image_is_read_only(image)),
+                        SD_JSON_BUILD_PAIR_BOOLEAN("readOnly", image->read_only),
                         JSON_BUILD_PAIR_UNSIGNED_NON_ZERO("creationTimestamp", image->crtime),
                         JSON_BUILD_PAIR_UNSIGNED_NON_ZERO("modificationTimestamp", image->mtime),
                         JSON_BUILD_PAIR_UNSIGNED_NOT_EQUAL("usage", image->usage, UINT64_MAX),

src/nspawn/nspawn.c

@@ -3077,7 +3077,7 @@ static int determine_names(void) {
                                 return log_oom();
 
                         if (!arg_ephemeral)
-                                arg_read_only = arg_read_only || image_is_read_only(i);
+                                arg_read_only = arg_read_only || i->read_only;
                 } else {
                         r = safe_getcwd(&arg_directory);
                         if (r < 0)

src/portable/portabled-bus.c

@@ -177,7 +177,7 @@ static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_er
                 r = sd_bus_message_append(reply, "(ssbtttso)",
                                           image->name,
                                           image_type_to_string(image->type),
-                                          image_is_read_only(image),
+                                          image->read_only,
                                           image->crtime,
                                           image->mtime,
                                           image->usage,

src/portable/portabled-image-bus.c

@@ -30,20 +30,6 @@
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType);
 
-static int property_get_read_only(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        Image *image = ASSERT_PTR(userdata);
-
-        return sd_bus_message_append(ASSERT_PTR(reply), "b", image_is_read_only(image));
-}
-
 int bus_image_common_get_os_release(
                 Manager *m,
                 sd_bus_message *message,
@@ -879,7 +865,7 @@ const sd_bus_vtable image_vtable[] = {
         SD_BUS_PROPERTY("Name", "s", NULL, offsetof(Image, name), 0),
         SD_BUS_PROPERTY("Path", "s", NULL, offsetof(Image, path), 0),
         SD_BUS_PROPERTY("Type", "s", property_get_type,  offsetof(Image, type), 0),
-        SD_BUS_PROPERTY("ReadOnly", "b", property_get_read_only, 0, 0),
+        SD_BUS_PROPERTY("ReadOnly", "b", bus_property_get_bool, offsetof(Image, read_only), 0),
         SD_BUS_PROPERTY("CreationTimestamp", "t", NULL, offsetof(Image, crtime), 0),
         SD_BUS_PROPERTY("ModificationTimestamp", "t", NULL, offsetof(Image, mtime), 0),
         SD_BUS_PROPERTY("Usage", "t", NULL, offsetof(Image, usage), 0),

src/shared/discover-image.c

@@ -36,13 +36,10 @@
 #include "log.h"
 #include "loop-util.h"
 #include "mkdir.h"
-#include "namespace-util.h"
-#include "nsresource.h"
 #include "nulstr-util.h"
 #include "os-util.h"
 #include "path-lookup.h"
 #include "path-util.h"
-#include "process-util.h"
 #include "rm-rf.h"
 #include "runtime-scope.h"
 #include "stat-util.h"
@@ -50,7 +47,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "uid-classification.h"
 #include "vpick.h"
 #include "xattr-util.h"
 
@@ -484,7 +480,6 @@ static int image_make(
                                 if (r < 0)
                                         return r;
 
-                                (*ret)->foreign_uid_owned = uid_is_foreign(st->st_uid);
                                 (void) image_update_quota(*ret, fd);
                                 return 0;
                         }
@@ -510,7 +505,6 @@ static int image_make(
                 if (r < 0)
                         return r;
 
-                (*ret)->foreign_uid_owned = uid_is_foreign(st->st_uid);
                 return 0;
 
         } else if (S_ISREG(st->st_mode) && endswith(filename, ".raw")) {
@@ -1137,64 +1131,6 @@ int image_discover(
         return 0;
 }
 
-static int unprivileged_remove(Image *i) {
-        int r;
-
-        assert(i);
-
-        _cleanup_close_ int userns_fd = nsresource_allocate_userns(/* name= */ NULL, /* size= */ NSRESOURCE_UIDS_64K);
-        if (userns_fd < 0)
-                return log_debug_errno(userns_fd, "Failed to allocate transient user namespace: %m");
-
-        _cleanup_close_ int tree_fd = -EBADF;
-        r = mountfsd_mount_directory(
-                        i->path,
-                        userns_fd,
-                        DISSECT_IMAGE_FOREIGN_UID,
-                        &tree_fd);
-        if (r < 0)
-                return r;
-        /* Fork off child that moves into userns and does the copying */
-        r = safe_fork_full(
-                        "rm-tree",
-                        /* stdio_fds= */ NULL,
-                        (int[]) { userns_fd, tree_fd, }, 2,
-                        FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_REOPEN_LOG,
-                        /* ret_pid= */ NULL);
-        if (r < 0)
-                return log_debug_errno(r, "Process that was supposed to remove tree failed: %m");
-        if (r == 0) {
-                /* child */
-
-                r = namespace_enter(
-                                /* pidns_fd= */ -EBADF,
-                                /* mntns_fd= */ -EBADF,
-                                /* netns_fd= */ -EBADF,
-                                userns_fd,
-                                /* root_fd= */ -EBADF);
-                if (r < 0) {
-                        log_debug_errno(r, "Failed to join user namespace: %m");
-                        _exit(EXIT_FAILURE);
-                }
-
-                _cleanup_close_ int dfd = fd_reopen(tree_fd, O_DIRECTORY|O_CLOEXEC);
-                if (dfd < 0) {
-                        log_error_errno(r, "Failed to reopen tree fd: %m");
-                        _exit(EXIT_FAILURE);
-                }
-
-                r = rm_rf_children(dfd, REMOVE_PHYSICAL|REMOVE_SUBVOLUME|REMOVE_CHMOD, /* root_dev= */ NULL);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to empty '%s' directory in foreign UID mode: %m", i->path);
-                        _exit(EXIT_FAILURE);
-                }
-
-                _exit(EXIT_SUCCESS);
-        }
-
-        return 0;
-}
-
 int image_remove(Image *i, RuntimeScope scope) {
         _cleanup_(release_lock_file) LockFile global_lock = LOCK_FILE_INIT, local_lock = LOCK_FILE_INIT;
         _cleanup_strv_free_ char **settings = NULL;
@@ -1236,11 +1172,6 @@ int image_remove(Image *i, RuntimeScope scope) {
         case IMAGE_DIRECTORY:
                 /* Allow deletion of read-only directories */
                 (void) chattr_path(i->path, 0, FS_IMMUTABLE_FL);
-
-                /* If this is foreign owned, try an unprivileged remove first, but accept if that doesn't work, and do it directly either way, maybe it works */
-                if (i->foreign_uid_owned)
-                        (void) unprivileged_remove(i);
-
                 r = rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
                 if (r < 0)
                         return r;
@@ -1467,87 +1398,6 @@ static int get_pool_directory(
         return 0;
 }
 
-static int unpriviled_clone(Image *i, const char *new_path) {
-        int r;
-
-        assert(i);
-        assert(new_path);
-
-        _cleanup_close_ int userns_fd = nsresource_allocate_userns(/* name= */ NULL, /* size= */ NSRESOURCE_UIDS_64K);
-        if (userns_fd < 0)
-                return log_debug_errno(userns_fd, "Failed to allocate transient user namespace: %m");
-
-        /* Map original image */
-        _cleanup_close_ int tree_fd = -EBADF;
-        r = mountfsd_mount_directory(
-                        i->path,
-                        userns_fd,
-                        DISSECT_IMAGE_FOREIGN_UID,
-                        &tree_fd);
-        if (r < 0)
-                return r;
-
-        /* Make new image */
-        _cleanup_close_ int new_fd = -EBADF;
-        r = mountfsd_make_directory(
-                        new_path,
-                        /* flags= */ 0,
-                        &new_fd);
-        if (r < 0)
-                return 0;
-
-        /* Mount new image */
-        _cleanup_close_ int target_fd = -EBADF;
-        r = mountfsd_mount_directory_fd(
-                        new_fd,
-                        userns_fd,
-                        DISSECT_IMAGE_FOREIGN_UID,
-                        &target_fd);
-        if (r < 0)
-                return r;
-
-        /* Fork off child that moves into userns and does the copying */
-        r = safe_fork_full(
-                        "clone-tree",
-                        /* stdio_fds= */ NULL,
-                        (int[]) { userns_fd, tree_fd, target_fd }, 3,
-                        FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_REOPEN_LOG,
-                        /* ret_pid= */ NULL);
-        if (r < 0)
-                return log_debug_errno(r, "Process that was supposed to clone tree failed: %m");
-        if (r == 0) {
-                /* child */
-
-                r = namespace_enter(
-                                /* pidns_fd= */ -EBADF,
-                                /* mntns_fd= */ -EBADF,
-                                /* netns_fd= */ -EBADF,
-                                userns_fd,
-                                /* root_fd= */ -EBADF);
-                if (r < 0) {
-                        log_debug_errno(r, "Failed to join user namespace: %m");
-                        _exit(EXIT_FAILURE);
-                }
-
-                r = copy_tree_at(
-                                tree_fd, /* from= */ NULL,
-                                target_fd, /* to= */ NULL,
-                                /* override_uid= */ UID_INVALID,
-                                /* override_gid= */ GID_INVALID,
-                                COPY_REFLINK|COPY_HARDLINKS|COPY_MERGE_EMPTY|COPY_MERGE_APPLY_STAT|COPY_SAME_MOUNT|COPY_ALL_XATTRS,
-                                /* denylist= */ NULL,
-                                /* subvolumes= */ NULL);
-                if (r < 0) {
-                        log_debug_errno(r, "Failed to copy clone tree: %m");
-                        _exit(EXIT_FAILURE);
-                }
-
-                _exit(EXIT_SUCCESS);
-        }
-
-        return 0;
-}
-
 int image_clone(Image *i, const char *new_name, bool read_only, RuntimeScope scope) {
         _cleanup_(release_lock_file) LockFile name_lock = LOCK_FILE_INIT;
         _cleanup_strv_free_ char **settings = NULL;
@@ -1592,12 +1442,7 @@ int image_clone(Image *i, const char *new_name, bool read_only, RuntimeScope sco
                 if (r < 0)
                         return r;
 
-                if (i->foreign_uid_owned)
+                r = btrfs_subvol_snapshot_at(AT_FDCWD, i->path, AT_FDCWD, new_path,
-                        r = unpriviled_clone(i, new_path);
-                else {
-                        r = btrfs_subvol_snapshot_at(
-                                        AT_FDCWD, i->path,
-                                        AT_FDCWD, new_path,
                                              (read_only ? BTRFS_SNAPSHOT_READ_ONLY : 0) |
                                              BTRFS_SNAPSHOT_FALLBACK_COPY |
                                              BTRFS_SNAPSHOT_FALLBACK_DIRECTORY |
@@ -1606,8 +1451,7 @@ int image_clone(Image *i, const char *new_name, bool read_only, RuntimeScope sco
                                              BTRFS_SNAPSHOT_QUOTA);
                 if (r >= 0)
                         /* Enable "subtree" quotas for the copy, if we didn't copy any quota from the source. */
-                                (void) btrfs_subvol_auto_qgroup(new_path, /* subvol_id= */ 0, /* create_intermediary_qgroup= */ true);
+                        (void) btrfs_subvol_auto_qgroup(new_path, 0, true);
-                }
 
                 break;
         }
@@ -1649,7 +1493,7 @@ int image_read_only(Image *i, bool b, RuntimeScope scope) {
 
         assert(i);
 
-        if (image_is_vendor(i) || image_is_host(i) || image_is_hidden(i))
+        if (image_is_vendor(i) || image_is_host(i))
                 return -EROFS;
 
         /* Make sure we don't interfere with a running nspawn */
@@ -2161,7 +2005,7 @@ int image_to_json(const struct Image *img, sd_json_variant **ret) {
                         SD_JSON_BUILD_PAIR_STRING("Class", image_class_to_string(img->class)),
                         SD_JSON_BUILD_PAIR_STRING("Name", img->name),
                         SD_JSON_BUILD_PAIR_CONDITION(!!img->path, "Path", SD_JSON_BUILD_STRING(img->path)),
-                        SD_JSON_BUILD_PAIR_BOOLEAN("ReadOnly", image_is_read_only(img)),
+                        SD_JSON_BUILD_PAIR_BOOLEAN("ReadOnly", img->read_only),
                         SD_JSON_BUILD_PAIR_CONDITION(img->crtime != 0, "CreationTimestamp", SD_JSON_BUILD_UNSIGNED(img->crtime)),
                         SD_JSON_BUILD_PAIR_CONDITION(img->mtime != 0, "ModificationTimestamp", SD_JSON_BUILD_UNSIGNED(img->mtime)),
                         SD_JSON_BUILD_PAIR_CONDITION(img->usage != UINT64_MAX, "Usage", SD_JSON_BUILD_UNSIGNED(img->usage)),

src/shared/discover-image.h

@@ -39,9 +39,8 @@ typedef struct Image {
         char **sysext_release;
         char **confext_release;
 
-        bool metadata_valid:1;     /* true if the above 6 metadata fields have been read from the image */
+        bool metadata_valid:1;
         bool discoverable:1;  /* true if we know for sure that image_find() would find the image given just the short name */
-        bool foreign_uid_owned:1;  /* true if this is of type IMAGE_DIRECTORY/IMAGE_SUBVOLUME and owned by foreign UID range */
 
         void *userdata;
 } Image;
@@ -85,28 +84,16 @@ static inline char** image_extension_release(Image *image, ImageClass class) {
         return NULL;
 }
 
-static inline bool image_is_hidden(const Image *i) {
+static inline bool image_is_hidden(const struct Image *i) {
         assert(i);
 
         return i->name && i->name[0] == '.';
 }
 
-static inline int image_is_read_only(const Image *i) {
+bool image_is_vendor(const struct Image *i);
-        assert(i);
+bool image_is_host(const struct Image *i);
 
-        /* We enforce the rule that hidden images are always read-only too. If people want to change hidden
+int image_to_json(const struct Image *i, sd_json_variant **ret);
-         * images they should make a copy first, and make that one mutable */
-
-        if (image_is_hidden(i))
-                return true;
-
-        return i->read_only;
-}
-
-bool image_is_vendor(const Image *i);
-bool image_is_host(const Image *i);
-
-int image_to_json(const Image *i, sd_json_variant **ret);
 
 int image_root_pick(RuntimeScope scope, ImageClass c, bool runtime, char **ret);
 

src/shared/rm-rf.c

@@ -449,18 +449,12 @@ int rm_rf_at(int dir_fd, const char *path, RemoveFlags flags) {
                 if (FLAGS_SET(flags, REMOVE_MISSING_OK) && r == -ENOENT)
                         return 0;
 
-                if (!IN_SET(r, -ENOTTY, -EINVAL, -ENOTDIR, -EPERM, -EACCES))
+                if (!IN_SET(r, -ENOTTY, -EINVAL, -ENOTDIR))
                         return r;
 
-                /* Not btrfs or not a subvolume, or permissions are not available (but might if we go via unlinkat()) */
+                /* Not btrfs or not a subvolume */
         }
 
-        /* In the next step we'll try to open the directory in order to enumerate its contents. This might
-         * not work due to perms, but we might still be able to delete it, hence let's try that first. */
-        if (FLAGS_SET(flags, REMOVE_ROOT | REMOVE_PHYSICAL))
-                if (unlinkat(dir_fd, path, AT_REMOVEDIR) >= 0)
-                        return 0;
-
         fd = openat_harder(dir_fd, path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME, flags, &old_mode);
         if (fd >= 0) {
                 /* We have a dir */