morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

bus-polkit: add a generic vtable for methods with no params, but with polkit

Browse Source
This commit is contained in:
Lennart Poettering
2025-05-15 09:30:37 +02:00
parent 231cab5c5e
commit 8d7d2edcbb
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/hostname/hostnamed.c
View File

@@ -1797,11 +1797,6 @@ static int connect_bus(Context *c) {
}
static int vl_method_describe(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
static const sd_json_dispatch_field dispatch_table[] = {
VARLINK_DISPATCH_POLKIT_FIELD,
{}
};
Context *c = ASSERT_PTR(userdata);
bool privileged;
int r;
@@ -1809,7 +1804,7 @@ static int vl_method_describe(sd_varlink *link, sd_json_variant *parameters, sd_
assert(link);
assert(parameters);
r = sd_varlink_dispatch(link, parameters, dispatch_table, /* userdata= */ NULL);
r = sd_varlink_dispatch(link, parameters, dispatch_table_polkit_only, /* userdata= */ NULL);
if (r != 0)
return r;

7
src/resolve/resolved-varlink.c
View File

@@ -1189,17 +1189,12 @@ static int vl_method_resolve_record(sd_varlink *link, sd_json_variant *parameter
}
static int verify_polkit(sd_varlink *link, sd_json_variant *parameters, const char *action) {
static const sd_json_dispatch_field dispatch_table[] = {
VARLINK_DISPATCH_POLKIT_FIELD,
{}
};
int r;
Manager *m = ASSERT_PTR(sd_varlink_get_userdata(ASSERT_PTR(link)));
assert(action);
r = sd_varlink_dispatch(link, parameters, dispatch_table, /* userdata = */ NULL);
r = sd_varlink_dispatch(link, parameters, dispatch_table_polkit_only, /* userdata= */ NULL);
if (r != 0)
return r;

5
src/shared/bus-polkit.c
View File

@@ -886,3 +886,8 @@ bool varlink_has_polkit_action(sd_varlink *link, const char *action, const char
return false;
#endif
}
const sd_json_dispatch_field dispatch_table_polkit_only[] = {
VARLINK_DISPATCH_POLKIT_FIELD,
{}
};

4
src/shared/bus-polkit.h
View File

@@ -35,6 +35,10 @@ static inline int varlink_verify_polkit_async(sd_varlink *link, sd_bus *bus, con
.type = SD_JSON_VARIANT_BOOLEAN, \
}
/* A dispatch table that only accepts (but ignores) the Polkit field, and refuses everything else. This can
* be used wherever methods do not accept any parameters but shall be access controlled via Polkit. */
extern const sd_json_dispatch_field dispatch_table_polkit_only[];
/* Generates the right Varlink introspection field for the allowInteractiveAuthentication field above. To be used in Varlink IDL definitions. */
#define VARLINK_DEFINE_POLKIT_INPUT \
SD_VARLINK_FIELD_COMMENT("Controls whether interactive authentication (via polkit) shall be allowed. If unspecified defaults to false."), \