mirror of
https://github.com/systemd/systemd
synced 2024-09-06 08:46:19 +00:00
bus-util: support details in CheckAuthorization calls
Extra details for an action can be supplied when calling polkit's CheckAuthorization method. Details are a list of key/value string pairs. Custom policy can use these details when making authorization decisions.
This commit is contained in:
parent
17258f5f27
commit
403ed0e5c9
|
@ -1198,22 +1198,22 @@ int bus_track_coldplug(Manager *m, sd_bus_track **t, char ***l) {
|
|||
}
|
||||
|
||||
int bus_verify_manage_units_async(Manager *m, sd_bus_message *call, sd_bus_error *error) {
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-units", false, UID_INVALID, &m->polkit_registry, error);
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-units", NULL, false, UID_INVALID, &m->polkit_registry, error);
|
||||
}
|
||||
|
||||
/* Same as bus_verify_manage_unit_async(), but checks for CAP_KILL instead of CAP_SYS_ADMIN */
|
||||
int bus_verify_manage_units_async_for_kill(Manager *m, sd_bus_message *call, sd_bus_error *error) {
|
||||
return bus_verify_polkit_async(call, CAP_KILL, "org.freedesktop.systemd1.manage-units", false, UID_INVALID, &m->polkit_registry, error);
|
||||
return bus_verify_polkit_async(call, CAP_KILL, "org.freedesktop.systemd1.manage-units", NULL, false, UID_INVALID, &m->polkit_registry, error);
|
||||
}
|
||||
|
||||
int bus_verify_manage_unit_files_async(Manager *m, sd_bus_message *call, sd_bus_error *error) {
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-unit-files", false, UID_INVALID, &m->polkit_registry, error);
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.manage-unit-files", NULL, false, UID_INVALID, &m->polkit_registry, error);
|
||||
}
|
||||
|
||||
int bus_verify_reload_daemon_async(Manager *m, sd_bus_message *call, sd_bus_error *error) {
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.reload-daemon", false, UID_INVALID, &m->polkit_registry, error);
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.reload-daemon", NULL, false, UID_INVALID, &m->polkit_registry, error);
|
||||
}
|
||||
|
||||
int bus_verify_set_environment_async(Manager *m, sd_bus_message *call, sd_bus_error *error) {
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.set-environment", false, UID_INVALID, &m->polkit_registry, error);
|
||||
return bus_verify_polkit_async(call, CAP_SYS_ADMIN, "org.freedesktop.systemd1.set-environment", NULL, false, UID_INVALID, &m->polkit_registry, error);
|
||||
}
|
||||
|
|
|
@ -434,6 +434,7 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error *
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.hostname1.set-hostname",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -486,6 +487,7 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.hostname1.set-static-hostname",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -557,6 +559,7 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
prop == PROP_PRETTY_HOSTNAME ? "org.freedesktop.hostname1.set-static-hostname" : "org.freedesktop.hostname1.set-machine-info",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
|
|
@ -735,6 +735,7 @@ static int method_import_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.import",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -799,6 +800,7 @@ static int method_export_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.export",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -864,6 +866,7 @@ static int method_pull_tar_or_raw(sd_bus_message *msg, void *userdata, sd_bus_er
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.pull",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -945,6 +948,7 @@ static int method_pull_dkr(sd_bus_message *msg, void *userdata, sd_bus_error *er
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.pull",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -1079,6 +1083,7 @@ static int method_cancel(sd_bus_message *msg, void *userdata, sd_bus_error *erro
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.pull",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&t->manager->polkit_registry,
|
||||
|
@ -1108,6 +1113,7 @@ static int method_cancel_transfer(sd_bus_message *msg, void *userdata, sd_bus_er
|
|||
msg,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.import1.pull",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
|
|
@ -960,6 +960,7 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.locale1.set-locale",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -1049,6 +1050,7 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.locale1.set-keyboard",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -1180,6 +1182,7 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
|
|||
m,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.locale1.set-keyboard",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
|
|
@ -942,6 +942,7 @@ static int method_lock_sessions(sd_bus_message *message, void *userdata, sd_bus_
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.lock-sessions",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -1096,6 +1097,7 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.set-user-linger",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -1268,6 +1270,7 @@ static int method_attach_device(sd_bus_message *message, void *userdata, sd_bus_
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.attach-device",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -1299,6 +1302,7 @@ static int method_flush_devices(sd_bus_message *message, void *userdata, sd_bus_
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.flush-devices",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -1649,7 +1653,7 @@ static int verify_shutdown_creds(
|
|||
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
|
||||
|
||||
if (multiple_sessions && action_multiple_sessions) {
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_multiple_sessions, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_multiple_sessions, NULL, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0)
|
||||
|
@ -1657,7 +1661,7 @@ static int verify_shutdown_creds(
|
|||
}
|
||||
|
||||
if (blocked && action_ignore_inhibit) {
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_ignore_inhibit, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_ignore_inhibit, NULL, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0)
|
||||
|
@ -1665,7 +1669,7 @@ static int verify_shutdown_creds(
|
|||
}
|
||||
|
||||
if (!multiple_sessions && !blocked && action) {
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action, NULL, interactive, UID_INVALID, &m->polkit_registry, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0)
|
||||
|
@ -2085,7 +2089,7 @@ static int method_can_shutdown_or_sleep(
|
|||
blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL);
|
||||
|
||||
if (multiple_sessions) {
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action_multiple_sessions, UID_INVALID, &challenge, error);
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action_multiple_sessions, NULL, UID_INVALID, &challenge, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -2098,7 +2102,7 @@ static int method_can_shutdown_or_sleep(
|
|||
}
|
||||
|
||||
if (blocked) {
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit, UID_INVALID, &challenge, error);
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit, NULL, UID_INVALID, &challenge, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -2114,7 +2118,7 @@ static int method_can_shutdown_or_sleep(
|
|||
/* If neither inhibit nor multiple sessions
|
||||
* apply then just check the normal policy */
|
||||
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action, UID_INVALID, &challenge, error);
|
||||
r = bus_test_polkit(message, CAP_SYS_BOOT, action, NULL, UID_INVALID, &challenge, error);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -2233,6 +2237,7 @@ static int method_set_reboot_to_firmware_setup(
|
|||
r = bus_verify_polkit_async(message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.set-reboot-to-firmware-setup",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -2271,6 +2276,7 @@ static int method_can_reboot_to_firmware_setup(
|
|||
r = bus_test_polkit(message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.set-reboot-to-firmware-setup",
|
||||
NULL,
|
||||
UID_INVALID,
|
||||
&challenge,
|
||||
error);
|
||||
|
@ -2307,6 +2313,7 @@ static int method_set_wall_message(
|
|||
r = bus_verify_polkit_async(message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.set-wall-message",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -2378,6 +2385,7 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error
|
|||
w == INHIBIT_HANDLE_SUSPEND_KEY ? "org.freedesktop.login1.inhibit-handle-suspend-key" :
|
||||
w == INHIBIT_HANDLE_HIBERNATE_KEY ? "org.freedesktop.login1.inhibit-handle-hibernate-key" :
|
||||
"org.freedesktop.login1.inhibit-handle-lid-switch",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
|
|
@ -204,6 +204,7 @@ int bus_seat_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.login1.manage",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&s->manager->polkit_registry,
|
||||
|
|
|
@ -191,6 +191,7 @@ int bus_session_method_terminate(sd_bus_message *message, void *userdata, sd_bus
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.login1.manage",
|
||||
NULL,
|
||||
false,
|
||||
s->user->uid,
|
||||
&s->manager->polkit_registry,
|
||||
|
@ -232,6 +233,7 @@ int bus_session_method_lock(sd_bus_message *message, void *userdata, sd_bus_erro
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.login1.lock-sessions",
|
||||
NULL,
|
||||
false,
|
||||
s->user->uid,
|
||||
&s->manager->polkit_registry,
|
||||
|
@ -306,6 +308,7 @@ int bus_session_method_kill(sd_bus_message *message, void *userdata, sd_bus_erro
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.login1.manage",
|
||||
NULL,
|
||||
false,
|
||||
s->user->uid,
|
||||
&s->manager->polkit_registry,
|
||||
|
|
|
@ -179,6 +179,7 @@ int bus_user_method_terminate(sd_bus_message *message, void *userdata, sd_bus_er
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.login1.manage",
|
||||
NULL,
|
||||
false,
|
||||
u->uid,
|
||||
&u->manager->polkit_registry,
|
||||
|
@ -207,6 +208,7 @@ int bus_user_method_kill(sd_bus_message *message, void *userdata, sd_bus_error *
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.login1.manage",
|
||||
NULL,
|
||||
false,
|
||||
u->uid,
|
||||
&u->manager->polkit_registry,
|
||||
|
|
|
@ -43,6 +43,7 @@ int bus_image_method_remove(
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-images",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -83,6 +84,7 @@ int bus_image_method_rename(
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-images",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -123,6 +125,7 @@ int bus_image_method_clone(
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-images",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -158,6 +161,7 @@ int bus_image_method_mark_read_only(
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-images",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
@ -194,6 +198,7 @@ int bus_image_method_set_limit(
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-images",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
|
|
@ -124,6 +124,7 @@ int bus_machine_method_terminate(sd_bus_message *message, void *userdata, sd_bus
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.machine1.manage-machines",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -169,6 +170,7 @@ int bus_machine_method_kill(sd_bus_message *message, void *userdata, sd_bus_erro
|
|||
message,
|
||||
CAP_KILL,
|
||||
"org.freedesktop.machine1.manage-machines",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -488,6 +490,7 @@ int bus_machine_method_open_pty(sd_bus_message *message, void *userdata, sd_bus_
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
m->class == MACHINE_HOST ? "org.freedesktop.machine1.host-open-pty" : "org.freedesktop.machine1.open-pty",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -577,6 +580,7 @@ int bus_machine_method_open_login(sd_bus_message *message, void *userdata, sd_bu
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
m->class == MACHINE_HOST ? "org.freedesktop.machine1.host-login" : "org.freedesktop.machine1.login",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -675,6 +679,7 @@ int bus_machine_method_open_shell(sd_bus_message *message, void *userdata, sd_bu
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
m->class == MACHINE_HOST ? "org.freedesktop.machine1.host-shell" : "org.freedesktop.machine1.shell",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -883,6 +888,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-machines",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
@ -1145,6 +1151,7 @@ int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_erro
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-machines",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->manager->polkit_registry,
|
||||
|
|
|
@ -810,6 +810,7 @@ static int method_set_pool_limit(sd_bus_message *message, void *userdata, sd_bus
|
|||
message,
|
||||
CAP_SYS_ADMIN,
|
||||
"org.freedesktop.machine1.manage-machines",
|
||||
NULL,
|
||||
false,
|
||||
UID_INVALID,
|
||||
&m->polkit_registry,
|
||||
|
|
|
@ -220,6 +220,7 @@ int bus_test_polkit(
|
|||
sd_bus_message *call,
|
||||
int capability,
|
||||
const char *action,
|
||||
const char **details,
|
||||
uid_t good_user,
|
||||
bool *_challenge,
|
||||
sd_bus_error *e) {
|
||||
|
@ -242,29 +243,52 @@ int bus_test_polkit(
|
|||
return 1;
|
||||
#ifdef ENABLE_POLKIT
|
||||
else {
|
||||
_cleanup_bus_message_unref_ sd_bus_message *request = NULL;
|
||||
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
|
||||
int authorized = false, challenge = false;
|
||||
const char *sender;
|
||||
const char *sender, **k, **v;
|
||||
|
||||
sender = sd_bus_message_get_sender(call);
|
||||
if (!sender)
|
||||
return -EBADMSG;
|
||||
|
||||
r = sd_bus_call_method(
|
||||
r = sd_bus_message_new_method_call(
|
||||
call->bus,
|
||||
&request,
|
||||
"org.freedesktop.PolicyKit1",
|
||||
"/org/freedesktop/PolicyKit1/Authority",
|
||||
"org.freedesktop.PolicyKit1.Authority",
|
||||
"CheckAuthorization",
|
||||
e,
|
||||
&reply,
|
||||
"(sa{sv})sa{ss}us",
|
||||
"system-bus-name", 1, "name", "s", sender,
|
||||
action,
|
||||
0,
|
||||
0,
|
||||
"");
|
||||
"CheckAuthorization");
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_append(
|
||||
request,
|
||||
"(sa{sv})s",
|
||||
"system-bus-name", 1, "name", "s", sender,
|
||||
action);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_open_container(request, 'a', "{ss}");
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
STRV_FOREACH_PAIR(k, v, details) {
|
||||
r = sd_bus_message_append(request, "{ss}", *k, *v);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
r = sd_bus_message_close_container(request);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_append(request, "us", 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_call(call->bus, request, 0, e, &reply);
|
||||
if (r < 0) {
|
||||
/* Treat no PK available as access denied */
|
||||
if (sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN)) {
|
||||
|
@ -354,6 +378,7 @@ int bus_verify_polkit_async(
|
|||
sd_bus_message *call,
|
||||
int capability,
|
||||
const char *action,
|
||||
const char **details,
|
||||
bool interactive,
|
||||
uid_t good_user,
|
||||
Hashmap **registry,
|
||||
|
@ -362,7 +387,7 @@ int bus_verify_polkit_async(
|
|||
#ifdef ENABLE_POLKIT
|
||||
_cleanup_bus_message_unref_ sd_bus_message *pk = NULL;
|
||||
AsyncPolkitQuery *q;
|
||||
const char *sender;
|
||||
const char *sender, **k, **v;
|
||||
sd_bus_message_handler_t callback;
|
||||
void *userdata;
|
||||
int c;
|
||||
|
@ -460,12 +485,27 @@ int bus_verify_polkit_async(
|
|||
|
||||
r = sd_bus_message_append(
|
||||
pk,
|
||||
"(sa{sv})sa{ss}us",
|
||||
"(sa{sv})s",
|
||||
"system-bus-name", 1, "name", "s", sender,
|
||||
action,
|
||||
0,
|
||||
!!interactive,
|
||||
NULL);
|
||||
action);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_open_container(pk, 'a', "{ss}");
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
STRV_FOREACH_PAIR(k, v, details) {
|
||||
r = sd_bus_message_append(pk, "{ss}", *k, *v);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
r = sd_bus_message_close_container(pk);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_bus_message_append(pk, "us", !!interactive, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
|
|
@ -60,9 +60,9 @@ int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error);
|
|||
|
||||
int bus_check_peercred(sd_bus *c);
|
||||
|
||||
int bus_test_polkit(sd_bus_message *call, int capability, const char *action, uid_t good_user, bool *_challenge, sd_bus_error *e);
|
||||
int bus_test_polkit(sd_bus_message *call, int capability, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e);
|
||||
|
||||
int bus_verify_polkit_async(sd_bus_message *call, int capability, const char *action, bool interactive, uid_t good_user, Hashmap **registry, sd_bus_error *error);
|
||||
int bus_verify_polkit_async(sd_bus_message *call, int capability, const char *action, const char **details, bool interactive, uid_t good_user, Hashmap **registry, sd_bus_error *error);
|
||||
void bus_verify_polkit_async_registry_free(Hashmap *registry);
|
||||
|
||||
int bus_open_system_systemd(sd_bus **_bus);
|
||||
|
|
|
@ -361,6 +361,7 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
|
|||
m,
|
||||
CAP_SYS_TIME,
|
||||
"org.freedesktop.timedate1.set-timezone",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -428,6 +429,7 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
|
|||
m,
|
||||
CAP_SYS_TIME,
|
||||
"org.freedesktop.timedate1.set-local-rtc",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -543,6 +545,7 @@ static int method_set_time(sd_bus_message *m, void *userdata, sd_bus_error *erro
|
|||
m,
|
||||
CAP_SYS_TIME,
|
||||
"org.freedesktop.timedate1.set-time",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
@ -601,6 +604,7 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
|
|||
m,
|
||||
CAP_SYS_TIME,
|
||||
"org.freedesktop.timedate1.set-ntp",
|
||||
NULL,
|
||||
interactive,
|
||||
UID_INVALID,
|
||||
&c->polkit_registry,
|
||||
|
|
Loading…
Reference in a new issue