machine: introduce io.systemd.Machine.Unregister varlink method

diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c
index 37bcf266f790138a526dba17a27dd35c024fb33d..810e94925c5856021d9885028632c661c5c4a096 100644 (file)
--- a/src/machine/machine-varlink.c
+++ b/src/machine/machine-varlink.c
@@ -275,3 +275,25 @@ int lookup_machine_by_name_or_pid(sd_varlink *link, Manager *manager, const char
 
         return 0;
 }
+
+int vl_method_unregister_internal(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
+        Machine *machine = ASSERT_PTR(userdata);
+        Manager *manager = ASSERT_PTR(machine->manager);
+        int r;
+
+        r = varlink_verify_polkit_async(
+                        link,
+                        manager->bus,
+                        "org.freedesktop.machine1.manage-machines",
+                        (const char**) STRV_MAKE("name", machine->name,
+                                                 "verb", "unregister"),
+                        &manager->polkit_registry);
+        if (r <= 0)
+                return r;
+
+        r = machine_finalize(machine);
+        if (r < 0)
+                return log_debug_errno(r, "Failed to finalize machine: %m");
+
+        return sd_varlink_reply(link, NULL);
+}

diff --git a/src/machine/machine-varlink.h b/src/machine/machine-varlink.h
index 4ec68d526035eefabf0c2a67bc373fdee165e59f..4f772d04b71e1adde59530bf7bd1ad45f707b34b 100644 (file)
--- a/src/machine/machine-varlink.h
+++ b/src/machine/machine-varlink.h
@@ -20,3 +20,4 @@
 int lookup_machine_by_name_or_pid(sd_varlink *link, Manager *manager, const char *machine_name, pid_t pid, Machine **ret_machine);
 
 int vl_method_register(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
+int vl_method_unregister_internal(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);

diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 4189ff2cf24aefd09645fd1911f79ddc94cba199..94d8c16799cea538a42a631e240794554d8945b7 100644 (file)
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -470,6 +470,38 @@ static int vl_method_list(sd_varlink *link, sd_json_variant *parameters, sd_varl
         return sd_varlink_error(link, "io.systemd.Machine.NoSuchMachine", NULL);
 }
 
+static int lookup_machine_and_call_method(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata, sd_varlink_method_t method) {
+        static const sd_json_dispatch_field dispatch_table[] = {
+                VARLINK_DISPATCH_MACHINE_LOOKUP_FIELDS(MachineLookupParameters),
+                VARLINK_DISPATCH_POLKIT_FIELD,
+                {}
+        };
+
+        Manager *manager = ASSERT_PTR(userdata);
+        MachineLookupParameters p = { .pid = -1 };
+        Machine *machine;
+        int r;
+
+        assert(link);
+        assert(parameters);
+
+        r = sd_varlink_dispatch(link, parameters, dispatch_table, &p);
+        if (r != 0)
+                return r;
+
+        r = lookup_machine_by_name_or_pid(link, manager, p.machine_name, p.pid, &machine);
+        if (r == -ESRCH)
+                return sd_varlink_error(link, "io.systemd.Machine.NoSuchMachine", NULL);
+        if (r < 0)
+                return r;
+
+        return method(link, parameters, flags, machine);
+}
+
+static int vl_method_unregister(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
+        return lookup_machine_and_call_method(link, parameters, flags, userdata, vl_method_unregister_internal);
+}
+
 static int manager_varlink_init_userdb(Manager *m) {
         _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *s = NULL;
         int r;
@@ -532,8 +564,9 @@ static int manager_varlink_init_machine(Manager *m) {
 
         r = sd_varlink_server_bind_method_many(
                         s,
-                        "io.systemd.Machine.Register", vl_method_register,
-                        "io.systemd.Machine.List",     vl_method_list);
+                        "io.systemd.Machine.Register",   vl_method_register,
+                        "io.systemd.Machine.List",       vl_method_list,
+                        "io.systemd.Machine.Unregister", vl_method_unregister);
         if (r < 0)
                 return log_error_errno(r, "Failed to register varlink methods: %m");
 

diff --git a/src/shared/varlink-io.systemd.Machine.c b/src/shared/varlink-io.systemd.Machine.c
index 334e4c7d9387eff451440dc171a9da0b744542b0..9b65dad363e2bd4146c219035a4cd0f00af624ab 100644 (file)
--- a/src/shared/varlink-io.systemd.Machine.c
+++ b/src/shared/varlink-io.systemd.Machine.c
@@ -28,6 +28,11 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("Timestamp in µs in the CLOCK_MONOTONIC clock"),
                 SD_VARLINK_DEFINE_FIELD(monotonic, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
 
+static SD_VARLINK_DEFINE_METHOD(
+                Unregister,
+                SD_VARLINK_FIELD_COMMENT("The name of a machine to unregister."),
+                SD_VARLINK_DEFINE_INPUT(name, SD_VARLINK_STRING, 0));
+
 static SD_VARLINK_DEFINE_METHOD_FULL(
                 List,
                 SD_VARLINK_SUPPORTS_MORE,
@@ -65,6 +70,7 @@ SD_VARLINK_DEFINE_INTERFACE(
                 SD_VARLINK_SYMBOL_COMMENT("A timestamp object consisting of both CLOCK_REALTIME and CLOCK_MONOTONIC timestamps"),
                 &vl_type_Timestamp,
                 &vl_method_Register,
+                &vl_method_Unregister,
                 SD_VARLINK_SYMBOL_COMMENT("List running machines"),
                 &vl_method_List,
                 SD_VARLINK_SYMBOL_COMMENT("No matching machine currently running"),