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

bus-policy: move name list iteration to policy users

Browse Source 
We need to figure out which of the possible names satisfied the policy,
so we cannot do the iteration in check_policy_item() but have to leave it
to the users.

Test cases amended accordingly.
This commit is contained in:
Daniel Mack
2014-10-09 13:26:53 +02:00
parent 374738d55b
commit d46fbfb48d
3 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/bus-proxyd/bus-policy.c
View File

@@ -602,14 +602,10 @@ struct policy_check_filter {
int class;
const struct ucred *ucred;
int message_type;
const char *name;
const char *interface;
const char *path;
union {
const char *name;
const char *member;
};
char **names_strv;
Hashmap *names_hash;
const char *member;
};
static int is_permissive(PolicyItem *i) {
@@ -628,13 +624,8 @@ static int check_policy_item(PolicyItem *i, const struct policy_check_filter *fi
case POLICY_ITEM_SEND:
case POLICY_ITEM_RECV:
if (i->name) {
if (filter->names_hash && !hashmap_contains(filter->names_hash, i->name))
break;
if (filter->names_strv && !strv_contains(filter->names_strv, i->name))
break;
}
if (i->name && !streq_ptr(i->name, filter->name))
break;
if ((i->message_type != _POLICY_ITEM_CLASS_UNSET) && (i->message_type != filter->message_type))
break;
@@ -651,14 +642,14 @@ static int check_policy_item(PolicyItem *i, const struct policy_check_filter *fi
return is_permissive(i);
case POLICY_ITEM_OWN:
assert(filter->member);
assert(filter->name);
if (streq(i->name, "*") || streq(i->name, filter->name))
return is_permissive(i);
break;
case POLICY_ITEM_OWN_PREFIX:
assert(filter->member);
assert(filter->name);
if (streq(i->name, "*") || startswith(i->name, filter->name))
return is_permissive(i);
@@ -780,8 +771,8 @@ bool policy_check_hello(Policy *p, const struct ucred *ucred) {
bool policy_check_recv(Policy *p,
const struct ucred *ucred,
Hashmap *names,
int message_type,
const char *name,
const char *path,
const char *interface,
const char *member) {
@@ -789,8 +780,8 @@ bool policy_check_recv(Policy *p,
struct policy_check_filter filter = {
.class = POLICY_ITEM_RECV,
.ucred = ucred,
.names_hash = names,
.message_type = message_type,
.name = name,
.interface = interface,
.path = path,
.member = member,
@@ -801,8 +792,8 @@ bool policy_check_recv(Policy *p,
bool policy_check_send(Policy *p,
const struct ucred *ucred,
char **names,
int message_type,
const char *name,
const char *path,
const char *interface,
const char *member) {
@@ -810,8 +801,8 @@ bool policy_check_send(Policy *p,
struct policy_check_filter filter = {
.class = POLICY_ITEM_SEND,
.ucred = ucred,
.names_strv = names,
.message_type = message_type,
.name = name,
.interface = interface,
.path = path,
.member = member,

4
src/bus-proxyd/bus-policy.h
View File

@@ -80,15 +80,15 @@ bool policy_check_own(Policy *p, const struct ucred *ucred, const char *name);
bool policy_check_hello(Policy *p, const struct ucred *ucred);
bool policy_check_recv(Policy *p,
const struct ucred *ucred,
Hashmap *names,
int message_type,
const char *name,
const char *path,
const char *interface,
const char *member);
bool policy_check_send(Policy *p,
const struct ucred *ucred,
char **names,
int message_type,
const char *name,
const char *path,
const char *interface,
const char *member);

21
src/bus-proxyd/test-bus-policy.c
View File

@@ -63,8 +63,6 @@ int main(int argc, char *argv[]) {
Policy p = {};
struct ucred ucred = {};
char **names_strv;
Hashmap *names_hash;
/* Ownership tests */
assert_se(test_policy_load(&p, "ownerships.conf") == 0);
@@ -93,32 +91,27 @@ int main(int argc, char *argv[]) {
/* Signaltest */
assert_se(test_policy_load(&p, "signals.conf") == 0);
names_strv = STRV_MAKE("bli.bla.blubb");
ucred.uid = 0;
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_SIGNAL, NULL, "/an/object/path", NULL) == true);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_SIGNAL, "bli.bla.blubb", NULL, "/an/object/path", NULL) == true);
ucred.uid = 1;
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_SIGNAL, NULL, "/an/object/path", NULL) == false);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_SIGNAL, "bli.bla.blubb", NULL, "/an/object/path", NULL) == false);
policy_free(&p);
/* Method calls */
assert_se(test_policy_load(&p, "methods.conf") == 0);
names_strv = STRV_MAKE("org.test.test1");
policy_dump(&p);
ucred.uid = 0;
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_METHOD_CALL, "/an/object/path", "bli.bla.blubb", "Member") == false);
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_METHOD_CALL, "/an/object/path", "bli.bla.blubb", "Member") == false);
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_METHOD_CALL, "/an/object/path", "org.test.int1", "Member") == true);
assert_se(policy_check_send(&p, &ucred, names_strv, SD_BUS_MESSAGE_METHOD_CALL, "/an/object/path", "org.test.int2", "Member") == true);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_METHOD_CALL, "org.test.test1", "/an/object/path", "bli.bla.blubb", "Member") == false);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_METHOD_CALL, "org.test.test1", "/an/object/path", "bli.bla.blubb", "Member") == false);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_METHOD_CALL, "org.test.test1", "/an/object/path", "org.test.int1", "Member") == true);
assert_se(policy_check_send(&p, &ucred, SD_BUS_MESSAGE_METHOD_CALL, "org.test.test1", "/an/object/path", "org.test.int2", "Member") == true);
names_hash = hashmap_new(&string_hash_ops);
assert(names_hash != NULL);
assert_se(hashmap_put(names_hash, "org.test.test3", NULL) >= 0);
assert_se(policy_check_recv(&p, &ucred, names_hash, SD_BUS_MESSAGE_METHOD_CALL, "/an/object/path", "org.test.int3", "Member111") == true);
assert_se(policy_check_recv(&p, &ucred, SD_BUS_MESSAGE_METHOD_CALL, "org.test.test3", "/an/object/path", "org.test.int3", "Member111") == true);
policy_free(&p);