53 lines
2.5 KiB
Diff
53 lines
2.5 KiB
Diff
From 9eacea6b51bb86fb2c066bd4fa7cba28a17d12f3 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Mack <daniel@zonque.org>
|
|
Date: Sat, 20 Sep 2014 04:34:30 +0200
|
|
Subject: [PATCH] bus-policy: resolve [ug]id of POLICY_ITEM_{USER,GROUP}
|
|
|
|
Do the lookup during parsing already, and set i->uid, or i->gid to the
|
|
numerical values.
|
|
---
|
|
src/bus-proxyd/bus-policy.c | 28 ++++++++++++++++++++++++++++
|
|
1 file changed, 28 insertions(+)
|
|
|
|
diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c
|
|
index 2c4708dd77..ab16cda32b 100644
|
|
--- a/src/bus-proxyd/bus-policy.c
|
|
+++ b/src/bus-proxyd/bus-policy.c
|
|
@@ -525,8 +525,36 @@ static int file_load(Policy *p, const char *path) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ switch (i->class) {
|
|
+ case POLICY_ITEM_USER:
|
|
+ if (!streq(name, "*")) {
|
|
+ const char *u = name;
|
|
+
|
|
+ r = get_user_creds(&u, &i->uid, NULL, NULL, NULL);
|
|
+ if (r < 0)
|
|
+ log_error("Failed to resolve user %s: %s", name, strerror(-r));
|
|
+ else
|
|
+ i->uid_valid = true;
|
|
+ }
|
|
+ break;
|
|
+ case POLICY_ITEM_GROUP:
|
|
+ if (!streq(name, "*")) {
|
|
+ const char *g = name;
|
|
+
|
|
+ r = get_group_creds(&g, &i->gid);
|
|
+ if (r < 0)
|
|
+ log_error("Failed to resolve group %s: %s", name, strerror(-r));
|
|
+ else
|
|
+ i->gid_valid = true;
|
|
+ }
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+
|
|
i->name = name;
|
|
name = NULL;
|
|
+
|
|
state = STATE_ALLOW_DENY;
|
|
} else {
|
|
log_error("Unexpected token (14) in %s:%u.", path, line);
|