diff options
| author | Daniel Mack <daniel@zonque.org> | 2014-10-09 13:26:53 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-10-09 13:31:01 +0200 |
| commit | d46fbfb48deff83943355992e55f9ef4431ff5ef (patch) | |
| tree | 8a9603e4569183cc311f660c00c67057c4fd5784 /src/bus-proxyd/test-bus-policy.c | |
| parent | 374738d55b2bc4ab07c22f9a0be95a76de1c9478 (diff) | |
bus-policy: move name list iteration to policy users
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.
Diffstat (limited to 'src/bus-proxyd/test-bus-policy.c')
| -rw-r--r-- | src/bus-proxyd/test-bus-policy.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/bus-proxyd/test-bus-policy.c b/src/bus-proxyd/test-bus-policy.c index 5267788b70..c9a027e877 100644 --- a/src/bus-proxyd/test-bus-policy.c +++ b/src/bus-proxyd/test-bus-policy.c @@ -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); |