bus: add new sd_bus_creds object to encapsulate process credentials

[elogind.git] / src / core / dbus.c

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 1cb4d0fa7dd37d09b82e3bb06c9d495afaf77dc2..7d7c6cbddc8cf96e6101d7df11f16be8119c325a 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -247,9 +247,14 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata,
         }
 
         if (streq_ptr(path, "/org/freedesktop/systemd1/unit/self")) {
         }
 
         if (streq_ptr(path, "/org/freedesktop/systemd1/unit/self")) {

+                _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;

                 pid_t pid;
 
                 pid_t pid;
 

-                r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds);
+                if (r < 0)
+                        return 0;
+
+                r = sd_bus_creds_get_pid(creds, &pid);

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


@@ -272,7 +277,7 @@ static int selinux_filter(sd_bus *bus, sd_bus_message *message, void *userdata,
         return 0;
 }
 
         return 0;
 }
 

-static int bus_job_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_job_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         Job *j;
         int r;
         Manager *m = userdata;
         Job *j;
         int r;


@@ -291,7 +296,7 @@ static int bus_job_find(sd_bus *bus, const char *path, const char *interface, vo
         return 1;
 }
 
         return 1;
 }
 

-static Unit *find_unit(Manager *m, sd_bus *bus, const char *path) {
+static int find_unit(Manager *m, sd_bus *bus, const char *path, Unit **unit, sd_bus_error *error) {

         Unit *u;
         int r;
 
         Unit *u;
         int r;
 


@@ -300,30 +305,38 @@ static Unit *find_unit(Manager *m, sd_bus *bus, const char *path) {
         assert(path);
 
         if (streq_ptr(path, "/org/freedesktop/systemd1/unit/self")) {
         assert(path);
 
         if (streq_ptr(path, "/org/freedesktop/systemd1/unit/self")) {

+                _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;

                 sd_bus_message *message;
                 pid_t pid;
 
                 message = sd_bus_get_current(bus);
                 if (!message)
                 sd_bus_message *message;
                 pid_t pid;
 
                 message = sd_bus_get_current(bus);
                 if (!message)

-                        return NULL;
+                        return 0;
+
+                r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_PID, &creds);
+                if (r < 0)
+                        return r;

 
 

-                r = sd_bus_get_owner_pid(bus, sd_bus_message_get_sender(message), &pid);
+                r = sd_bus_creds_get_pid(creds, &pid);

                 if (r < 0)
                 if (r < 0)

-                        return NULL;
+                        return r;

 
                 u = manager_get_unit_by_pid(m, pid);
         } else {
 
                 u = manager_get_unit_by_pid(m, pid);
         } else {

-                r = manager_load_unit_from_dbus_path(m, path, NULL, &u);
+                r = manager_load_unit_from_dbus_path(m, path, error, &u);

                 if (r < 0)
                 if (r < 0)

-                        return NULL;
+                        return 0;

         }
 
         }
 

-        return u;
+        if (!u)
+                return 0;
+
+        *unit = u;
+        return 1;

 }
 
 }
 

-static int bus_unit_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_unit_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         Manager *m = userdata;

-        Unit *u;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -331,17 +344,13 @@ static int bus_unit_find(sd_bus *bus, const char *path, const char *interface, v
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
-
-        *found = u;
-        return 1;
+        return find_unit(m, bus, path, (Unit**) found, error);

 }
 
 }
 

-static int bus_unit_interface_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_unit_interface_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         Unit *u;
         Manager *m = userdata;
         Unit *u;

+        int r;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -349,9 +358,9 @@ static int bus_unit_interface_find(sd_bus *bus, const char *path, const char *in
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
+        r = find_unit(m, bus, path, &u, error);
+        if (r <= 0)
+                return r;

 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;
 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;


@@ -360,9 +369,10 @@ static int bus_unit_interface_find(sd_bus *bus, const char *path, const char *in
         return 1;
 }
 
         return 1;
 }
 

-static int bus_unit_cgroup_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_unit_cgroup_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         Unit *u;
         Manager *m = userdata;
         Unit *u;

+        int r;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -370,9 +380,9 @@ static int bus_unit_cgroup_find(sd_bus *bus, const char *path, const char *inter
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
+        r = find_unit(m, bus, path, &u, error);
+        if (r <= 0)
+                return r;

 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;
 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;


@@ -384,10 +394,11 @@ static int bus_unit_cgroup_find(sd_bus *bus, const char *path, const char *inter
         return 1;
 }
 
         return 1;
 }
 

-static int bus_cgroup_context_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_cgroup_context_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         CGroupContext *c;
         Unit *u;
         Manager *m = userdata;
         CGroupContext *c;
         Unit *u;

+        int r;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -395,9 +406,9 @@ static int bus_cgroup_context_find(sd_bus *bus, const char *path, const char *in
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
+        r = find_unit(m, bus, path, &u, error);
+        if (r <= 0)
+                return r;

 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;
 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;


@@ -410,10 +421,11 @@ static int bus_cgroup_context_find(sd_bus *bus, const char *path, const char *in
         return 1;
 }
 
         return 1;
 }
 

-static int bus_exec_context_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_exec_context_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         ExecContext *c;
         Unit *u;
         Manager *m = userdata;
         ExecContext *c;
         Unit *u;

+        int r;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -421,9 +433,9 @@ static int bus_exec_context_find(sd_bus *bus, const char *path, const char *inte
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
+        r = find_unit(m, bus, path, &u, error);
+        if (r <= 0)
+                return r;

 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;
 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;


@@ -436,10 +448,11 @@ static int bus_exec_context_find(sd_bus *bus, const char *path, const char *inte
         return 1;
 }
 
         return 1;
 }
 

-static int bus_kill_context_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata) {
+static int bus_kill_context_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error) {

         Manager *m = userdata;
         KillContext *c;
         Unit *u;
         Manager *m = userdata;
         KillContext *c;
         Unit *u;

+        int r;

 
         assert(bus);
         assert(path);
 
         assert(bus);
         assert(path);


@@ -447,9 +460,9 @@ static int bus_kill_context_find(sd_bus *bus, const char *path, const char *inte
         assert(found);
         assert(m);
 
         assert(found);
         assert(m);
 

-        u = find_unit(m, bus, path);
-        if (!u)
-                return 0;
+        r = find_unit(m, bus, path, &u, error);
+        if (r <= 0)
+                return r;

 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;
 
         if (!streq_ptr(interface, UNIT_VTABLE(u)->bus_interface))
                 return 0;


@@ -462,7 +475,7 @@ static int bus_kill_context_find(sd_bus *bus, const char *path, const char *inte
         return 1;
 }
 
         return 1;
 }
 

-static int bus_job_enumerate(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
+static int bus_job_enumerate(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {

         _cleanup_free_ char **l = NULL;
         Manager *m = userdata;
         unsigned k = 0;
         _cleanup_free_ char **l = NULL;
         Manager *m = userdata;
         unsigned k = 0;


@@ -489,7 +502,7 @@ static int bus_job_enumerate(sd_bus *bus, const char *path, char ***nodes, void
         return k;
 }
 
         return k;
 }
 

-static int bus_unit_enumerate(sd_bus *bus, const char *path, char ***nodes, void *userdata) {
+static int bus_unit_enumerate(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {

         _cleanup_free_ char **l = NULL;
         Manager *m = userdata;
         unsigned k = 0;
         _cleanup_free_ char **l = NULL;
         Manager *m = userdata;
         unsigned k = 0;