bus-util: simplify bus_verify_polkit_async() a bit

[elogind.git] / src / libsystemd / sd-bus / bus-util.c

diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c
index b5b3c857b8afc3075f38fe363d49b285f0365b54..44facc6ef91e64d9d0176ee292e913165f4f2018 100644 (file)
--- a/src/libsystemd/sd-bus/bus-util.c
+++ b/src/libsystemd/sd-bus/bus-util.c
@@ -43,7 +43,9 @@ static int name_owner_change_callback(sd_bus *bus, sd_bus_message *m, void *user
         assert(m);
         assert(e);
 
         assert(m);
         assert(e);
 

+        sd_bus_close(bus);

         sd_event_exit(e, 0);
         sd_event_exit(e, 0);

+

         return 1;
 }
 
         return 1;
 }
 


@@ -121,11 +123,30 @@ int bus_event_loop_with_idle(
                         return r;
 
                 if (r == 0 && !exiting) {
                         return r;
 
                 if (r == 0 && !exiting) {

-                        r = bus_async_unregister_and_exit(e, bus, name);
+
+                        r = sd_bus_try_close(bus);
+                        if (r == -EBUSY)
+                                continue;
+
+                        if (r == -ENOTSUP) {
+                                /* Fallback for dbus1 connections: we
+                                 * unregister the name and wait for
+                                 * the response to come through for
+                                 * it */
+
+                                r = bus_async_unregister_and_exit(e, bus, name);
+                                if (r < 0)
+                                        return r;
+
+                                exiting = true;
+                                continue;
+                        }
+

                         if (r < 0)
                                 return r;
 
                         if (r < 0)
                                 return r;
 

-                        exiting = true;
+                        sd_event_exit(e, 0);
+                        break;

                 }
         }
 
                 }
         }
 


@@ -163,44 +184,35 @@ int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error) {
 }
 
 int bus_verify_polkit(
 }
 
 int bus_verify_polkit(

-                sd_bus *bus,
-                sd_bus_message *m,
+                sd_bus_message *call,
+                int capability,

                 const char *action,
                 bool interactive,
                 bool *_challenge,
                 sd_bus_error *e) {
 
                 const char *action,
                 bool interactive,
                 bool *_challenge,
                 sd_bus_error *e) {
 

-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
-        uid_t uid;

         int r;
 
         int r;
 

-        assert(bus);
-        assert(m);
+        assert(call);

         assert(action);
 
         assert(action);
 

-        r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_UID, &creds);
+        r = sd_bus_query_sender_privilege(call, capability);

         if (r < 0)
                 return r;
         if (r < 0)
                 return r;

-
-        r = sd_bus_creds_get_uid(creds, &uid);
-        if (r < 0)
-                return r;
-
-        if (uid == 0)
+        else if (r > 0)

                 return 1;
                 return 1;

-

 #ifdef ENABLE_POLKIT
         else {
                 _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
                 int authorized = false, challenge = false;
                 const char *sender;
 
 #ifdef ENABLE_POLKIT
         else {
                 _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
                 int authorized = false, challenge = false;
                 const char *sender;
 

-                sender = sd_bus_message_get_sender(m);
+                sender = sd_bus_message_get_sender(call);

                 if (!sender)
                         return -EBADMSG;
 
                 r = sd_bus_call_method(
                 if (!sender)
                         return -EBADMSG;
 
                 r = sd_bus_call_method(

-                                bus,
+                                call->bus,

                                 "org.freedesktop.PolicyKit1",
                                 "/org/freedesktop/PolicyKit1/Authority",
                                 "org.freedesktop.PolicyKit1.Authority",
                                 "org.freedesktop.PolicyKit1",
                                 "/org/freedesktop/PolicyKit1/Authority",
                                 "org.freedesktop.PolicyKit1.Authority",


@@ -301,31 +313,29 @@ finish:
 #endif
 
 int bus_verify_polkit_async(
 #endif
 
 int bus_verify_polkit_async(

-                sd_bus *bus,
-                Hashmap **registry,
-                sd_bus_message *m,
+                sd_bus_message *call,
+                int capability,

                 const char *action,
                 bool interactive,
                 const char *action,
                 bool interactive,

-                sd_bus_error *error,
-                sd_bus_message_handler_t callback,
-                void *userdata) {
+                Hashmap **registry,
+                sd_bus_error *error) {

 
 #ifdef ENABLE_POLKIT
         _cleanup_bus_message_unref_ sd_bus_message *pk = NULL;
 
 #ifdef ENABLE_POLKIT
         _cleanup_bus_message_unref_ sd_bus_message *pk = NULL;

+        _cleanup_bus_slot_unref_ sd_bus_slot *slot = NULL;

         AsyncPolkitQuery *q;
         const char *sender;
         AsyncPolkitQuery *q;
         const char *sender;

+        sd_bus_message_handler_t callback;
+        void *userdata;

 #endif
 #endif

-        _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
-        uid_t uid;

         int r;
 
         int r;
 

-        assert(bus);
-        assert(registry);
-        assert(m);
+        assert(call);

         assert(action);
         assert(action);

+        assert(registry);

 
 #ifdef ENABLE_POLKIT
 
 #ifdef ENABLE_POLKIT

-        q = hashmap_get(*registry, m);
+        q = hashmap_get(*registry, call);

         if (q) {
                 int authorized, challenge;
 
         if (q) {
                 int authorized, challenge;
 


@@ -362,19 +372,23 @@ int bus_verify_polkit_async(
         }
 #endif
 
         }
 #endif
 

-        r = sd_bus_query_sender_creds(m, SD_BUS_CREDS_UID, &creds);
-        if (r < 0)
-                return r;
-
-        r = sd_bus_creds_get_uid(creds, &uid);
+        r = sd_bus_query_sender_privilege(call, capability);

         if (r < 0)
                 return r;
         if (r < 0)
                 return r;

-
-        if (uid == 0)
+        else if (r > 0)

                 return 1;
 
 #ifdef ENABLE_POLKIT
                 return 1;
 
 #ifdef ENABLE_POLKIT

-        sender = sd_bus_message_get_sender(m);
+        if (sd_bus_get_current_message(call->bus) != call)
+                return -EINVAL;
+
+        callback = sd_bus_get_current_handler(call->bus);
+        if (!callback)
+                return -EINVAL;
+
+        userdata = sd_bus_get_current_userdata(call->bus);
+
+        sender = sd_bus_message_get_sender(call);

         if (!sender)
                 return -EBADMSG;
 
         if (!sender)
                 return -EBADMSG;
 


@@ -383,7 +397,7 @@ int bus_verify_polkit_async(
                 return r;
 
         r = sd_bus_message_new_method_call(
                 return r;
 
         r = sd_bus_message_new_method_call(

-                        bus,
+                        call->bus,

                         &pk,
                         "org.freedesktop.PolicyKit1",
                         "/org/freedesktop/PolicyKit1/Authority",
                         &pk,
                         "org.freedesktop.PolicyKit1",
                         "/org/freedesktop/PolicyKit1/Authority",


@@ -407,11 +421,11 @@ int bus_verify_polkit_async(
         if (!q)
                 return -ENOMEM;
 
         if (!q)
                 return -ENOMEM;
 

-        q->request = sd_bus_message_ref(m);
+        q->request = sd_bus_message_ref(call);

         q->callback = callback;
         q->userdata = userdata;
 
         q->callback = callback;
         q->userdata = userdata;
 

-        r = hashmap_put(*registry, m, q);
+        r = hashmap_put(*registry, call, q);

         if (r < 0) {
                 async_polkit_query_free(q);
                 return r;
         if (r < 0) {
                 async_polkit_query_free(q);
                 return r;


@@ -419,7 +433,7 @@ int bus_verify_polkit_async(
 
         q->registry = *registry;
 
 
         q->registry = *registry;
 

-        r = sd_bus_call_async(bus, &q->slot, pk, async_polkit_callback, q, 0);
+        r = sd_bus_call_async(call->bus, &q->slot, pk, async_polkit_callback, q, 0);

         if (r < 0) {
                 async_polkit_query_free(q);
                 return r;
         if (r < 0) {
                 async_polkit_query_free(q);
                 return r;


@@ -431,7 +445,7 @@ int bus_verify_polkit_async(
         return -EACCES;
 }
 
         return -EACCES;
 }
 

-void bus_verify_polkit_async_registry_free(sd_bus *bus, Hashmap *registry) {
+void bus_verify_polkit_async_registry_free(Hashmap *registry) {

 #ifdef ENABLE_POLKIT
         AsyncPolkitQuery *q;
 
 #ifdef ENABLE_POLKIT
         AsyncPolkitQuery *q;
 


@@ -537,7 +551,7 @@ int bus_open_user_systemd(sd_bus **_bus) {
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, (unsigned long) getuid()) < 0)
+        if (asprintf(&bus->address, KERNEL_USER_BUS_FMT, getuid()) < 0)

                 return -ENOMEM;
 
         bus->bus_client = true;
                 return -ENOMEM;
 
         bus->bus_client = true;


@@ -1104,20 +1118,6 @@ int bus_open_transport_systemd(BusTransport transport, const char *host, bool us
         return r;
 }
 
         return r;
 }
 

-int bus_property_get_tristate(
-                sd_bus *bus,
-                const char *path,
-                const char *interface,
-                const char *property,
-                sd_bus_message *reply,
-                void *userdata,
-                sd_bus_error *error) {
-
-        int *tristate = userdata;
-
-        return sd_bus_message_append(reply, "b", *tristate > 0);
-}
-

 int bus_property_get_bool(
                 sd_bus *bus,
                 const char *path,
 int bus_property_get_bool(
                 sd_bus *bus,
                 const char *path,


@@ -1179,12 +1179,12 @@ int bus_property_get_ulong(
 #endif
 
 int bus_log_parse_error(int r) {
 #endif
 
 int bus_log_parse_error(int r) {

-        log_error("Failed to parse message: %s", strerror(-r));
+        log_error("Failed to parse bus message: %s", strerror(-r));

         return r;
 }
 
 int bus_log_create_error(int r) {
         return r;
 }
 
 int bus_log_create_error(int r) {

-        log_error("Failed to create message: %s", strerror(-r));
+        log_error("Failed to create bus message: %s", strerror(-r));

         return r;
 }
 
         return r;
 }
 


@@ -1258,7 +1258,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
                         if (r < 0)
                                 return bus_log_create_error(r);
 
                         if (r < 0)
                                 return bus_log_create_error(r);
 

-                        r = sd_bus_message_append(m, "v", "t", (usec_t) -1);
+                        r = sd_bus_message_append(m, "v", "t", USEC_INFINITY);

 
                 } else if (endswith(eq, "%")) {
                         double percent;
 
                 } else if (endswith(eq, "%")) {
                         double percent;


@@ -1274,40 +1274,10 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
 
                         r = sd_bus_message_append(m, "v", "t", (usec_t) percent * USEC_PER_SEC / 100);
                 } else {
 
                         r = sd_bus_message_append(m, "v", "t", (usec_t) percent * USEC_PER_SEC / 100);
                 } else {

-                        usec_t us;
-
-                        r = parse_sec(eq, &us);
-                        if (r < 0) {
-                                log_error("CPU quota '%s' invalid.", eq);
-                                return -EINVAL;
-                        }
-
-                        r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, "CPUQuotaUSec");
-                        if (r < 0)
-                                return bus_log_create_error(r);
-
-                        r = sd_bus_message_append(m, "v", "t", us);
-                }
-
-                if (r < 0)
-                        return bus_log_create_error(r);
-
-                return 0;
-
-        } else if (streq(field, "CPUQuotaPeriodSec")) {
-                usec_t us;
-
-                r = parse_sec(eq, &us);
-                if (r < 0) {
-                        log_error("CPU period '%s' invalid.", eq);
+                        log_error("CPU quota needs to be in percent.");

                         return -EINVAL;
                 }
 
                         return -EINVAL;
                 }
 

-                r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, "CPUQuotaPeriodUSec");
-                if (r < 0)
-                        return bus_log_create_error(r);
-
-                r = sd_bus_message_append(m, "v", "t", us);

                 if (r < 0)
                         return bus_log_create_error(r);
 
                 if (r < 0)
                         return bus_log_create_error(r);