mirror of
https://github.com/systemd/systemd.git
synced 2025-03-31 14:50:15 +03:00
homed: convert to the new scheme and add --bus-introspect
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
parent
1a0e562a5b
commit
cfd508a9d6
@ -712,38 +712,13 @@ int bus_home_method_release(
|
||||
/* We map a uid_t as uint32_t bus property, let's ensure this is safe. */
|
||||
assert_cc(sizeof(uid_t) == sizeof(uint32_t));
|
||||
|
||||
const sd_bus_vtable home_vtable[] = {
|
||||
SD_BUS_VTABLE_START(0),
|
||||
SD_BUS_PROPERTY("UserName", "s", NULL, offsetof(Home, user_name), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||
SD_BUS_PROPERTY("UID", "u", NULL, offsetof(Home, uid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||||
SD_BUS_PROPERTY("UnixRecord", "(suusss)", property_get_unix_record, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||||
SD_BUS_PROPERTY("State", "s", property_get_state, 0, 0),
|
||||
SD_BUS_PROPERTY("UserRecord", "(sb)", property_get_user_record, 0, SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Activate", "s", NULL, bus_home_method_activate, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Deactivate", NULL, NULL, bus_home_method_deactivate, 0),
|
||||
SD_BUS_METHOD("Unregister", NULL, NULL, bus_home_method_unregister, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Realize", "s", NULL, bus_home_method_realize, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Remove", NULL, NULL, bus_home_method_remove, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("Fixate", "s", NULL, bus_home_method_fixate, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Authenticate", "s", NULL, bus_home_method_authenticate, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Update", "s", NULL, bus_home_method_update, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Resize", "ts", NULL, bus_home_method_resize, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("ChangePassword", "ss", NULL, bus_home_method_change_password, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Lock", NULL, NULL, bus_home_method_lock, 0),
|
||||
SD_BUS_METHOD("Unlock", "s", NULL, bus_home_method_unlock, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Acquire", "sb", "h", bus_home_method_acquire, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Ref", "b", "h", bus_home_method_ref, 0),
|
||||
SD_BUS_METHOD("Release", NULL, NULL, bus_home_method_release, 0),
|
||||
SD_BUS_VTABLE_END
|
||||
};
|
||||
|
||||
int bus_home_path(Home *h, char **ret) {
|
||||
assert(ret);
|
||||
|
||||
return sd_bus_path_encode("/org/freedesktop/home1/home", h->user_name, ret);
|
||||
}
|
||||
|
||||
int bus_home_object_find(
|
||||
static int bus_home_object_find(
|
||||
sd_bus *bus,
|
||||
const char *path,
|
||||
const char *interface,
|
||||
@ -772,7 +747,7 @@ int bus_home_object_find(
|
||||
return 1;
|
||||
}
|
||||
|
||||
int bus_home_node_enumerator(
|
||||
static int bus_home_node_enumerator(
|
||||
sd_bus *bus,
|
||||
const char *path,
|
||||
void *userdata,
|
||||
@ -802,6 +777,107 @@ int bus_home_node_enumerator(
|
||||
return 1;
|
||||
}
|
||||
|
||||
const sd_bus_vtable home_vtable[] = {
|
||||
SD_BUS_VTABLE_START(0),
|
||||
|
||||
SD_BUS_PROPERTY("UserName", "s",
|
||||
NULL, offsetof(Home, user_name),
|
||||
SD_BUS_VTABLE_PROPERTY_CONST),
|
||||
SD_BUS_PROPERTY("UID", "u",
|
||||
NULL, offsetof(Home, uid),
|
||||
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||||
SD_BUS_PROPERTY("UnixRecord", "(suusss)",
|
||||
property_get_unix_record, 0,
|
||||
SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||||
SD_BUS_PROPERTY("State", "s",
|
||||
property_get_state, 0,
|
||||
0),
|
||||
SD_BUS_PROPERTY("UserRecord", "(sb)",
|
||||
property_get_user_record, 0,
|
||||
SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("Activate",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_activate,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Deactivate", NULL, NULL, bus_home_method_deactivate, 0),
|
||||
SD_BUS_METHOD("Unregister", NULL, NULL, bus_home_method_unregister, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Realize",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_realize,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
SD_BUS_METHOD("Remove", NULL, NULL, bus_home_method_remove, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("Fixate",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_fixate,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("Authenticate",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_authenticate,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("Update",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_update,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("Resize",
|
||||
"ts",
|
||||
SD_BUS_PARAM(size)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_resize,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("ChangePassword",
|
||||
"ss",
|
||||
SD_BUS_PARAM(new_user_record)
|
||||
SD_BUS_PARAM(old_user_record),
|
||||
NULL,,
|
||||
bus_home_method_change_password,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("Lock", NULL, NULL, bus_home_method_lock, 0),
|
||||
SD_BUS_METHOD_WITH_NAMES("Unlock",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
bus_home_method_unlock,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("Acquire",
|
||||
"sb",
|
||||
SD_BUS_PARAM(user_record)
|
||||
SD_BUS_PARAM(please_suspend),
|
||||
"h",
|
||||
SD_BUS_PARAM(send_fd),
|
||||
bus_home_method_acquire,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("Ref",
|
||||
"b",
|
||||
SD_BUS_PARAM(please_suspend),
|
||||
"h",
|
||||
SD_BUS_PARAM(send_fd),
|
||||
bus_home_method_ref,
|
||||
0),
|
||||
SD_BUS_METHOD("Release", NULL, NULL, bus_home_method_release, 0),
|
||||
SD_BUS_VTABLE_END
|
||||
};
|
||||
|
||||
const BusObjectImplementation home_object = {
|
||||
"/org/freedesktop/home1/home",
|
||||
"org.freedesktop.home1.Home",
|
||||
.fallback_vtables = BUS_FALLBACK_VTABLES({home_vtable, bus_home_object_find}),
|
||||
.node_enumerator = bus_home_node_enumerator,
|
||||
.manager = true,
|
||||
};
|
||||
|
||||
static int on_deferred_change(sd_event_source *s, void *userdata) {
|
||||
_cleanup_free_ char *path = NULL;
|
||||
Home *h = userdata;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include "sd-bus.h"
|
||||
|
||||
#include "bus-util.h"
|
||||
#include "homed-home.h"
|
||||
|
||||
int bus_home_client_is_trusted(Home *h, sd_bus_message *message);
|
||||
@ -25,12 +26,9 @@ int bus_home_method_acquire(sd_bus_message *message, void *userdata, sd_bus_erro
|
||||
int bus_home_method_ref(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||
int bus_home_method_release(sd_bus_message *message, void *userdata, sd_bus_error *error);
|
||||
|
||||
extern const sd_bus_vtable home_vtable[];
|
||||
extern const BusObjectImplementation home_object;
|
||||
|
||||
int bus_home_path(Home *h, char **ret);
|
||||
|
||||
int bus_home_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
|
||||
int bus_home_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
|
||||
|
||||
int bus_home_emit_change(Home *h);
|
||||
int bus_home_emit_remove(Home *h);
|
||||
|
||||
@ -600,44 +600,210 @@ static int method_lock_all_homes(sd_bus_message *message, void *userdata, sd_bus
|
||||
return sd_bus_reply_method_return(message, NULL);
|
||||
}
|
||||
|
||||
const sd_bus_vtable manager_vtable[] = {
|
||||
static const sd_bus_vtable manager_vtable[] = {
|
||||
SD_BUS_VTABLE_START(0),
|
||||
|
||||
SD_BUS_PROPERTY("AutoLogin", "a(sso)", property_get_auto_login, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||||
|
||||
SD_BUS_METHOD("GetHomeByName", "s", "usussso", method_get_home_by_name, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetHomeByUID", "u", "ssussso", method_get_home_by_uid, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD("GetUserRecordByName", "s", "sbo", method_get_user_record_by_name, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("GetUserRecordByUID", "u", "sbo", method_get_user_record_by_uid, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("ListHomes", NULL, "a(susussso)", method_list_homes, SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("GetHomeByName",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
"usussso",
|
||||
SD_BUS_PARAM(uid)
|
||||
SD_BUS_PARAM(home_state)
|
||||
SD_BUS_PARAM(gid)
|
||||
SD_BUS_PARAM(real_name)
|
||||
SD_BUS_PARAM(home_directory)
|
||||
SD_BUS_PARAM(shell)
|
||||
SD_BUS_PARAM(bus_path),
|
||||
method_get_home_by_name,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("GetHomeByUID",
|
||||
"u",
|
||||
SD_BUS_PARAM(uid),
|
||||
"ssussso",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(home_state)
|
||||
SD_BUS_PARAM(gid)
|
||||
SD_BUS_PARAM(real_name)
|
||||
SD_BUS_PARAM(home_directory)
|
||||
SD_BUS_PARAM(shell)
|
||||
SD_BUS_PARAM(bus_path),
|
||||
method_get_home_by_uid,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
SD_BUS_METHOD_WITH_NAMES("GetUserRecordByName",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
"sbo",
|
||||
SD_BUS_PARAM(user_record)
|
||||
SD_BUS_PARAM(incomplete)
|
||||
SD_BUS_PARAM(bus_path),
|
||||
method_get_user_record_by_name,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("GetUserRecordByUID",
|
||||
"u",
|
||||
SD_BUS_PARAM(uid),
|
||||
"sbo",
|
||||
SD_BUS_PARAM(user_record)
|
||||
SD_BUS_PARAM(incomplete)
|
||||
SD_BUS_PARAM(bus_path),
|
||||
method_get_user_record_by_uid,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("ListHomes",
|
||||
NULL,,
|
||||
"a(susussso)",
|
||||
SD_BUS_PARAM(home_areas),
|
||||
method_list_homes,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
/* The following methods directly execute an operation on a home area, without ref-counting, queueing
|
||||
* or anything, and are accessible through homectl. */
|
||||
SD_BUS_METHOD("ActivateHome", "ss", NULL, method_activate_home, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("DeactivateHome", "s", NULL, method_deactivate_home, 0),
|
||||
SD_BUS_METHOD("RegisterHome", "s", NULL, method_register_home, SD_BUS_VTABLE_UNPRIVILEGED), /* Add JSON record to homed, but don't create actual $HOME */
|
||||
SD_BUS_METHOD("UnregisterHome", "s", NULL, method_unregister_home, SD_BUS_VTABLE_UNPRIVILEGED), /* Remove JSON record from homed, but don't remove actual $HOME */
|
||||
SD_BUS_METHOD("CreateHome", "s", NULL, method_create_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), /* Add JSON record, and create $HOME for it */
|
||||
SD_BUS_METHOD("RealizeHome", "ss", NULL, method_realize_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), /* Create $HOME for already registered JSON entry */
|
||||
SD_BUS_METHOD("RemoveHome", "s", NULL, method_remove_home, SD_BUS_VTABLE_UNPRIVILEGED), /* Remove JSON record and remove $HOME */
|
||||
SD_BUS_METHOD("FixateHome", "ss", NULL, method_fixate_home, SD_BUS_VTABLE_SENSITIVE), /* Investigate $HOME and propagate contained JSON record into our database */
|
||||
SD_BUS_METHOD("AuthenticateHome", "ss", NULL, method_authenticate_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), /* Just check credentials */
|
||||
SD_BUS_METHOD("UpdateHome", "s", NULL, method_update_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), /* Update JSON record of existing user */
|
||||
SD_BUS_METHOD("ResizeHome", "sts", NULL, method_resize_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("ChangePasswordHome", "sss", NULL, method_change_password_home, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("LockHome", "s", NULL, method_lock_home, 0), /* Prepare active home for system suspend: flush out passwords, suspend access */
|
||||
SD_BUS_METHOD("UnlockHome", "ss", NULL, method_unlock_home, SD_BUS_VTABLE_SENSITIVE), /* Make $HOME usable after system resume again */
|
||||
SD_BUS_METHOD_WITH_NAMES("ActivateHome",
|
||||
"ss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_activate_home,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("DeactivateHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
NULL,,
|
||||
method_deactivate_home,
|
||||
0),
|
||||
|
||||
/* The following methods implement ref-counted activation, and are what the PAM module calls (and
|
||||
* what "homectl with" runs). In contrast to the methods above which fail if an operation is already
|
||||
* being executed on a home directory, these ones will queue the request, and are thus more
|
||||
* reliable. Moreover, they are a bit smarter: AcquireHome() will fixate, activate, unlock, or
|
||||
* authenticate depending on the state of the home, so that the end result is always the same
|
||||
* (i.e. the home directory is accessible), and we always validate the specified passwords. RefHome()
|
||||
* will not authenticate, and thus only works if home is already active. */
|
||||
SD_BUS_METHOD("AcquireHome", "ssb", "h", method_acquire_home, SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD("RefHome", "sb", "h", method_ref_home, 0),
|
||||
SD_BUS_METHOD("ReleaseHome", "s", NULL, method_release_home, 0),
|
||||
/* Add the JSON record to homed, but don't create actual $HOME */
|
||||
SD_BUS_METHOD_WITH_NAMES("RegisterHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(home_record),
|
||||
NULL,,
|
||||
method_register_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
/* Remove the JSON record from homed, but don't remove actual $HOME */
|
||||
SD_BUS_METHOD_WITH_NAMES("UnregisterHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
NULL,,
|
||||
method_unregister_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
/* Add JSON record, and create $HOME for it */
|
||||
SD_BUS_METHOD_WITH_NAMES("CreateHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(home_record),
|
||||
NULL,,
|
||||
method_create_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* Create $HOME for already registered JSON entry */
|
||||
SD_BUS_METHOD_WITH_NAMES("RealizeHome",
|
||||
"ss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_realize_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* Remove the JSON record and remove $HOME */
|
||||
SD_BUS_METHOD_WITH_NAMES("RemoveHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
NULL,,
|
||||
method_remove_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED),
|
||||
|
||||
/* Investigate $HOME and propagate contained JSON record into our database */
|
||||
SD_BUS_METHOD_WITH_NAMES("FixateHome",
|
||||
"ss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_fixate_home,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* Just check credentials */
|
||||
SD_BUS_METHOD_WITH_NAMES("AuthenticateHome",
|
||||
"ss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_authenticate_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* Update the JSON record of existing user */
|
||||
SD_BUS_METHOD_WITH_NAMES("UpdateHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_update_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("ResizeHome",
|
||||
"sts",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(size)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_resize_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
SD_BUS_METHOD_WITH_NAMES("ChangePasswordHome",
|
||||
"sss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(new_user_record)
|
||||
SD_BUS_PARAM(old_user_record),
|
||||
NULL,,
|
||||
method_change_password_home,
|
||||
SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* Prepare active home for system suspend: flush out passwords, suspend access */
|
||||
SD_BUS_METHOD_WITH_NAMES("LockHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
NULL,,
|
||||
method_lock_home,
|
||||
0),
|
||||
|
||||
/* Make $HOME usable after system resume again */
|
||||
SD_BUS_METHOD_WITH_NAMES("UnlockHome",
|
||||
"ss",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record),
|
||||
NULL,,
|
||||
method_unlock_home,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
|
||||
/* The following methods implement ref-counted activation, and are what the PAM module and "homectl
|
||||
* with" use. In contrast to the methods above which fail if an operation is already being executed
|
||||
* on a home directory, these ones will queue the request, and are thus more reliable. Moreover,
|
||||
* they are a bit smarter: AcquireHome() will fixate, activate, unlock, or authenticate depending on
|
||||
* the state of the home area, so that the end result is always the same (i.e. the home directory is
|
||||
* accessible), and we always validate the specified passwords. RefHome() will not authenticate, and
|
||||
* thus only works if the home area is already active. */
|
||||
SD_BUS_METHOD_WITH_NAMES("AcquireHome",
|
||||
"ssb",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(user_record)
|
||||
SD_BUS_PARAM(please_suspend),
|
||||
"h",
|
||||
SD_BUS_PARAM(send_fd),
|
||||
method_acquire_home,
|
||||
SD_BUS_VTABLE_SENSITIVE),
|
||||
SD_BUS_METHOD_WITH_NAMES("RefHome",
|
||||
"sb",
|
||||
SD_BUS_PARAM(user_name)
|
||||
SD_BUS_PARAM(please_suspend),
|
||||
"h",
|
||||
SD_BUS_PARAM(send_fd),
|
||||
method_ref_home,
|
||||
0),
|
||||
SD_BUS_METHOD_WITH_NAMES("ReleaseHome",
|
||||
"s",
|
||||
SD_BUS_PARAM(user_name),
|
||||
NULL,,
|
||||
method_release_home,
|
||||
0),
|
||||
|
||||
/* An operation that acts on all homes that allow it */
|
||||
SD_BUS_METHOD("LockAllHomes", NULL, NULL, method_lock_all_homes, 0),
|
||||
@ -645,6 +811,13 @@ const sd_bus_vtable manager_vtable[] = {
|
||||
SD_BUS_VTABLE_END
|
||||
};
|
||||
|
||||
const BusObjectImplementation manager_object = {
|
||||
"/org/freedesktop/home1",
|
||||
"org.freedesktop.home1.Manager",
|
||||
.vtables = BUS_VTABLES(manager_vtable),
|
||||
.children = BUS_IMPLEMENTATIONS(&home_object),
|
||||
};
|
||||
|
||||
static int on_deferred_auto_login(sd_event_source *s, void *userdata) {
|
||||
Manager *m = userdata;
|
||||
int r;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
#pragma once
|
||||
|
||||
#include "sd-bus.h"
|
||||
#include "bus-util.h"
|
||||
|
||||
extern const sd_bus_vtable manager_vtable[];
|
||||
extern const BusObjectImplementation manager_object;
|
||||
|
||||
@ -879,23 +879,7 @@ static int manager_connect_bus(Manager *m) {
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to connect to system bus: %m");
|
||||
|
||||
r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/home1", "org.freedesktop.home1.Manager", manager_vtable, m);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to add manager object vtable: %m");
|
||||
|
||||
r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/home1/home", "org.freedesktop.home1.Home", home_vtable, bus_home_object_find, m);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to add image object vtable: %m");
|
||||
|
||||
r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/home1/home", bus_home_node_enumerator, m);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to add image enumerator: %m");
|
||||
|
||||
r = sd_bus_add_object_manager(m->bus, NULL, "/org/freedesktop/home1/home");
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to add object manager: %m");
|
||||
|
||||
r = bus_log_control_api_register(m->bus);
|
||||
r = bus_add_implementation(m->bus, &manager_object, m);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
@ -3,10 +3,13 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "bus-log-control-api.h"
|
||||
#include "daemon-util.h"
|
||||
#include "homed-manager.h"
|
||||
#include "homed-manager-bus.h"
|
||||
#include "log.h"
|
||||
#include "main-func.h"
|
||||
#include "service-util.h"
|
||||
#include "signal-util.h"
|
||||
|
||||
static int run(int argc, char *argv[]) {
|
||||
@ -16,10 +19,15 @@ static int run(int argc, char *argv[]) {
|
||||
|
||||
log_setup_service();
|
||||
|
||||
umask(0022);
|
||||
r = service_parse_argv("systemd-homed.service",
|
||||
"A service to create, remove, change or inspect home areas.",
|
||||
BUS_IMPLEMENTATIONS(&manager_object,
|
||||
&log_control_object),
|
||||
argc, argv);
|
||||
if (r <= 0)
|
||||
return r;
|
||||
|
||||
if (argc != 1)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");
|
||||
umask(0022);
|
||||
|
||||
if (setenv("SYSTEMD_BYPASS_USERDB", "io.systemd.Home", 1) < 0)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to set $SYSTEMD_BYPASS_USERDB: %m");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user