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

diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c
index 810e94925c5856021d9885028632c661c5c4a096..06c59887aa701853e4e799ddedca764f0cb027d6 100644 (file)
--- a/src/machine/machine-varlink.c
+++ b/src/machine/machine-varlink.c
@@ -297,3 +297,25 @@ int vl_method_unregister_internal(sd_varlink *link, sd_json_variant *parameters,
 
         return sd_varlink_reply(link, NULL);
 }
+
+int vl_method_terminate_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", "terminate"),
+                        &manager->polkit_registry);
+        if (r <= 0)
+                return r;
+
+        r = machine_stop(machine);
+        if (r < 0)
+                return log_debug_errno(r, "Failed to stop machine: %m");
+
+        return sd_varlink_reply(link, NULL);
+}

diff --git a/src/machine/machine-varlink.h b/src/machine/machine-varlink.h
index 4f772d04b71e1adde59530bf7bd1ad45f707b34b..8b0efc2a639744982d65dc932d690ec1f0c3e198 100644 (file)
--- a/src/machine/machine-varlink.h
+++ b/src/machine/machine-varlink.h
@@ -21,3 +21,4 @@ int lookup_machine_by_name_or_pid(sd_varlink *link, Manager *manager, const char
 
 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);
+int vl_method_terminate_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 94d8c16799cea538a42a631e240794554d8945b7..fbf03ad4a1669d62e982b3bccb6df1a7de0afe78 100644 (file)
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -502,6 +502,10 @@ static int vl_method_unregister(sd_varlink *link, sd_json_variant *parameters, s
         return lookup_machine_and_call_method(link, parameters, flags, userdata, vl_method_unregister_internal);
 }
 
+static int vl_method_terminate(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_terminate_internal);
+}
+
 static int manager_varlink_init_userdb(Manager *m) {
         _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *s = NULL;
         int r;
@@ -566,7 +570,8 @@ static int manager_varlink_init_machine(Manager *m) {
                         s,
                         "io.systemd.Machine.Register",   vl_method_register,
                         "io.systemd.Machine.List",       vl_method_list,
-                        "io.systemd.Machine.Unregister", vl_method_unregister);
+                        "io.systemd.Machine.Unregister", vl_method_unregister,
+                        "io.systemd.Machine.Terminate",  vl_method_terminate);
         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 9b65dad363e2bd4146c219035a4cd0f00af624ab..d37f31bc3f1fc5e527dde928c44f81864fbbcdf8 100644 (file)
--- a/src/shared/varlink-io.systemd.Machine.c
+++ b/src/shared/varlink-io.systemd.Machine.c
@@ -33,6 +33,11 @@ static SD_VARLINK_DEFINE_METHOD(
                 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(
+                Terminate,
+                SD_VARLINK_FIELD_COMMENT("The name of a machine to terminate."),
+                SD_VARLINK_DEFINE_INPUT(name, SD_VARLINK_STRING, 0));
+
 static SD_VARLINK_DEFINE_METHOD_FULL(
                 List,
                 SD_VARLINK_SUPPORTS_MORE,
@@ -71,6 +76,8 @@ SD_VARLINK_DEFINE_INTERFACE(
                 &vl_type_Timestamp,
                 &vl_method_Register,
                 &vl_method_Unregister,
+                SD_VARLINK_SYMBOL_COMMENT("Terminate machine, killing its processes"),
+                &vl_method_Terminate,
                 SD_VARLINK_SYMBOL_COMMENT("List running machines"),
                 &vl_method_List,
                 SD_VARLINK_SYMBOL_COMMENT("No matching machine currently running"),