From c1a77d2c58c78abc606f1cb7918704596ebf2bfe Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Mon, 13 Jan 2014 18:44:57 +0900 Subject: [PATCH] [lib-fix] moved dbus_connection_get_unix_user from daemon to library This function must be declared at library code even if enable_kdbus_transport is set (same as dbus_connection_get_unix_process_id) --- bus/driver.c | 112 +++++++++++++------------- bus/kdbus-d.c | 214 ++----------------------------------------------- bus/kdbus-d.h | 16 +--- bus/services.c | 2 +- dbus/dbus-connection.c | 51 +++++++----- dbus/kdbus-common.c | 153 +++++++++++++++++++++++++++++++++++ dbus/kdbus-common.h | 14 +++- 7 files changed, 259 insertions(+), 303 deletions(-) diff --git a/bus/driver.c b/bus/driver.c index 3c4239d..0b6e7f0 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -1483,32 +1483,32 @@ bus_driver_handle_get_connection_unix_user (DBusConnection *connection, goto oom; #ifdef ENABLE_KDBUS_TRANSPORT - if(bus_context_is_kdbus(bus_transaction_get_context (transaction))) - { - const char* name; + if (bus_context_is_kdbus (bus_transaction_get_context (transaction))) + { + const char* name; - if(!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) - goto failed; - if(!kdbus_get_unix_user(connection, name, &uid, error)) - goto failed; - } + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + goto failed; + if (!kdbus_connection_get_unix_user (connection, name, &uid, error)) + goto failed; + } else #endif - { - conn = bus_driver_get_conn_helper (connection, message, "UID", &service, - error); + { + conn = bus_driver_get_conn_helper (connection, message, "UID", &service, + error); - if (conn == NULL) - goto failed; + if (conn == NULL) + goto failed; - if (!dbus_connection_get_unix_user (conn, &uid)) - { - dbus_set_error (error, - DBUS_ERROR_FAILED, - "Could not determine UID for '%s'", service); - goto failed; - } - } + if (!dbus_connection_get_unix_user (conn, &uid)) + { + dbus_set_error (error, + DBUS_ERROR_FAILED, + "Could not determine UID for '%s'", service); + goto failed; + } + } uid32 = uid; if (! dbus_message_append_args (reply, @@ -1551,31 +1551,31 @@ bus_driver_handle_get_connection_unix_process_id (DBusConnection *connection, if (reply == NULL) goto oom; #ifdef ENABLE_KDBUS_TRANSPORT - if(bus_context_is_kdbus(bus_transaction_get_context (transaction))) + if (bus_context_is_kdbus (bus_transaction_get_context (transaction))) { const char* name; - if(!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) goto failed; - if(!kdbus_get_connection_unix_process_id(connection, name, &pid, error)) + if (!kdbus_connection_get_unix_process_id (connection, name, &pid, error)) goto failed; } - else + else #endif - { - conn = bus_driver_get_conn_helper (connection, message, "PID", &service, - error); - if (conn == NULL) - goto failed; - - if (!dbus_connection_get_unix_process_id (conn, &pid)) { - dbus_set_error (error, - DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN, - "Could not determine PID for '%s'", service); - goto failed; + conn = bus_driver_get_conn_helper (connection, message, "PID", &service, + error); + if (conn == NULL) + goto failed; + + if (!dbus_connection_get_unix_process_id (conn, &pid)) + { + dbus_set_error (error, + DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN, + "Could not determine PID for '%s'", service); + goto failed; + } } - } pid32 = pid; if (! dbus_message_append_args (reply, @@ -1767,27 +1767,27 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection, #ifdef ENABLE_KDBUS_TRANSPORT } else - { - const char* name; + { + const char* name; - if(!dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) - goto failed; - if(kdbus_get_connection_unix_process_id(connection, name, &ulong_val, error)) - { - if (!_dbus_asv_add_uint32 (&array_iter, "ProcessID", ulong_val)) - goto oom; - } - else - goto failed; + if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) + goto failed; + if (kdbus_connection_get_unix_process_id (connection, name, &ulong_val, error)) + { + if (!_dbus_asv_add_uint32 (&array_iter, "ProcessID", ulong_val)) + goto oom; + } + else + goto failed; - if(kdbus_get_unix_user(connection, name, &ulong_val, error)) - { - if (!_dbus_asv_add_uint32 (&array_iter, "UnixUserID", ulong_val)) - goto oom; - } - else - goto failed; - } + if (kdbus_connection_get_unix_user (connection, name, &ulong_val, error)) + { + if (!_dbus_asv_add_uint32 (&array_iter, "UnixUserID", ulong_val)) + goto oom; + } + else + goto failed; + } #endif if (!_dbus_asv_close (&reply_iter, &array_iter)) diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index db97c25..a0975fd 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -23,14 +23,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - #include #include "kdbus-d.h" -#define KDBUS_FOR_SBB #include #include #include "dispatch.h" -#include #include #include #include "connection.h" @@ -212,101 +209,6 @@ dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id) } } -/** - * Performs kdbus query of id of the given name - * - * @param name name to query for - * @param transport transport - * @param pInfo nameInfo structure address to store info about the name - * @return 0 on success, -errno if failed - */ -int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo) -{ - struct kdbus_cmd_conn_info *cmd; - int ret; - int fd; - uint64_t size; - __u64 id = 0; - - memset(pInfo, 0, sizeof(struct nameInfo)); - - if(!_dbus_transport_get_socket_fd(transport, &fd)) - return -EPERM; - - size = sizeof(struct kdbus_cmd_conn_info); - if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ - id = strtoull(&name[3], NULL, 10); - if(id == 0) - size += strlen(name) + 1; - - cmd = alloca(size); - if (!cmd) - { - _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); - return -errno; - } - - memset(cmd, 0, sizeof(struct kdbus_cmd_conn_info)); - cmd->size = size; - cmd->id = id; - if(id == 0) - memcpy(cmd->name, name, strlen(name) + 1); - - again: - ret = ioctl(fd, KDBUS_CMD_CONN_INFO, cmd); - if (ret < 0) - { - if(errno == EINTR) - goto again; - pInfo->uniqueId = 0; - return -errno; - } - else - { - struct kdbus_conn_info *info; - struct kdbus_item *item; - - info = (struct kdbus_conn_info *)((char*)dbus_transport_get_pool_pointer(transport) + cmd->offset); - pInfo->uniqueId = info->id; - - item = info->items; - while((uint8_t *)(item) < (uint8_t *)(info) + info->size) - { - if(item->type == KDBUS_ITEM_CREDS) - { - pInfo->userId = item->creds.uid; - pInfo->processId = item->creds.pid; - } - - if(item->type == KDBUS_ITEM_SECLABEL) - { - pInfo->sec_label_len = item->size - KDBUS_ITEM_HEADER_SIZE - 1; - if(pInfo->sec_label_len != 0) - { - pInfo->sec_label = malloc(pInfo->sec_label_len); - if(pInfo->sec_label == NULL) - ret = -1; - else - memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); - } - } - - item = KDBUS_PART_NEXT(item); - } - - again2: - if (ioctl(fd, KDBUS_CMD_FREE, &cmd->offset) < 0) - { - if(errno == EINTR) - goto again2; - _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); - return -errno; - } - } - - return ret; -} - /* * Creates kdbus bus of given type. */ @@ -366,6 +268,7 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); item->data64[0] = 64; +#ifdef KDBUS_FOR_SBB addr_value = strchr(address, ':') + 1; if(*addr_value) { @@ -377,6 +280,7 @@ char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) return NULL; } } +#endif _dbus_verbose("Opening /dev/kdbus/control\n"); fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); @@ -768,7 +672,7 @@ dbus_bool_t kdbus_add_match_rule (DBusConnection* connection, DBusMessage* messa if(!add_match_kdbus (dbus_connection_get_transport(connection), sender_id, text)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:%d, %s", + dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:%llu, %s", sender_id, _dbus_strerror_from_errno ()); return FALSE; } @@ -789,7 +693,7 @@ dbus_bool_t kdbus_remove_match (DBusConnection* connection, DBusMessage* message if(!remove_match_kdbus (dbus_connection_get_transport(connection), sender_id)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not remove match rules for id:%d", sender_id); + dbus_set_error (error, _dbus_error_from_errno (errno), "Could not remove match rules for id:%llu", sender_id); return FALSE; } @@ -814,64 +718,6 @@ int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* own } /* - * Asks kdbus for uid of the owner of the name given in the message - */ -dbus_bool_t kdbus_get_unix_user(DBusConnection* connection, const char* name, unsigned long* uid, DBusError* error) -{ - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); - *uid = info.userId; - return TRUE; - } - else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner - { - _dbus_verbose ("Name %s has no owner.\n", name); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get UID of name '%s': no such name", name); - } - - else - { - _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name); - } - - return ret; -} - -/* - * Asks kdbus for pid of the owner of the name given in the message - */ -dbus_bool_t kdbus_get_connection_unix_process_id(DBusConnection* connection, const char* name, unsigned long* pid, DBusError* error) -{ - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("Process id:%llu\n", (unsigned long long) info.processId); - *pid = info.processId; - return TRUE; - } - else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get PID of name '%s': no such name", name); - else - { - _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); - dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine PID for '%s'", name); - } - - return ret; -} - -/* * Asks kdbus for selinux_security_context of the owner of the name given in the message */ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* connection, DBusMessage* message, DBusMessage* reply, DBusError* error) @@ -903,57 +749,6 @@ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* c return ret; } -/** - * Gets the UNIX user ID of the connection from kdbus, if known. Returns #TRUE if - * the uid is filled in. Always returns #FALSE on non-UNIX platforms - * for now., though in theory someone could hook Windows to NIS or - * something. Always returns #FALSE prior to authenticating the - * connection. - * - * The UID of is only read by bus daemon from kdbus. You can not - * call this function from client side of the connection. - * - * You can ask the bus to tell you the UID of another connection though - * if you like; this is done with dbus_bus_get_unix_user(). - * - * @param connection the connection - * @param uid return location for the user ID - * @returns #TRUE if uid is filled in with a valid user ID - */ -dbus_bool_t -dbus_connection_get_unix_user (DBusConnection *connection, - unsigned long *uid) -{ - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (uid != NULL, FALSE); - - if(bus_context_is_kdbus(bus_connection_get_context (connection))) - return kdbus_get_unix_user(connection, bus_connection_get_name(connection), uid, NULL); - - return dbus_connection_get_unix_user_dbus(connection, uid); -} - -/** - * Gets the process ID of the connection if any. - * Returns #TRUE if the pid is filled in. - * - * @param connection the connection - * @param pid return location for the process ID - * @returns #TRUE if uid is filled in with a valid process ID - */ -dbus_bool_t -dbus_connection_get_unix_process_id (DBusConnection *connection, - unsigned long *pid) -{ - _dbus_return_val_if_fail (connection != NULL, FALSE); - _dbus_return_val_if_fail (pid != NULL, FALSE); - - if(bus_context_is_kdbus(bus_connection_get_context (connection))) - return kdbus_get_connection_unix_process_id(connection, bus_connection_get_name(connection), pid, NULL); - - return dbus_connection_get_unix_process_id_dbus(connection, pid); -} - /* * Create connection structure for given name. It is needed to control starters - activatable services * and for ListQueued method (as long as kdbus is not supporting it). This connections don't have it's own @@ -976,6 +771,7 @@ DBusConnection* create_phantom_connection(DBusConnection* connection, const char dbus_set_error (error, DBUS_ERROR_FAILED , "Name \"%s\" could not be acquired", name); goto out; } + dbus_bus_set_unique_name(phantom_connection, name); if(!bus_connection_complete(phantom_connection, &Sname, error)) { bus_connection_disconnected(phantom_connection); diff --git a/bus/kdbus-d.h b/bus/kdbus-d.h index eaa1830..7bbab69 100644 --- a/bus/kdbus-d.h +++ b/bus/kdbus-d.h @@ -33,6 +33,7 @@ #include #include #include +#include __u64 sender_name_to_id(const char* name, DBusError* error); char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error); @@ -49,24 +50,9 @@ dbus_bool_t kdbus_remove_match (DBusConnection* connection, DBusMessage* message dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rule); dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id); -struct nameInfo -{ - __u64 uniqueId; - __u64 userId; - __u64 processId; - __u32 sec_label_len; - char *sec_label; -}; -int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo); - int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* owner); -dbus_bool_t kdbus_get_unix_user(DBusConnection* connection, const char* name, unsigned long* uid, DBusError* error); -dbus_bool_t kdbus_get_connection_unix_process_id(DBusConnection* connection, const char* name, unsigned long* pid, DBusError* error); dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* connection, DBusMessage* message, DBusMessage* reply, DBusError* error); -dbus_bool_t dbus_connection_get_unix_user (DBusConnection *connection, unsigned long *uid); -dbus_bool_t dbus_connection_get_unix_process_id (DBusConnection *connection, unsigned long *pid); - DBusConnection* daemon_as_client(DBusBusType type, char* address, DBusError *error); dbus_bool_t register_daemon_name(DBusConnection* connection); DBusConnection* create_phantom_connection(DBusConnection* connection, const char* unique_name, DBusError* error); diff --git a/bus/services.c b/bus/services.c index f6b56ee..90a2f5f 100644 --- a/bus/services.c +++ b/bus/services.c @@ -723,7 +723,7 @@ bus_registry_acquire_kdbus_service (BusRegistry *registry, goto failed; } - if (!kdbus_get_unix_user(phantom, conn_unique_name, &uid, NULL)) + if (!kdbus_connection_get_unix_user(phantom, conn_unique_name, &uid, NULL)) goto failed; #ifdef POLICY_TO_KDBUS diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 401e888..2c62436 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -47,6 +47,7 @@ #include "dbus-marshal-basic.h" #ifdef ENABLE_KDBUS_TRANSPORT #include "dbus-transport-kdbus.h" +#include "kdbus-common.h" #include #endif @@ -5254,15 +5255,9 @@ dbus_connection_get_socket(DBusConnection *connection, * @param uid return location for the user ID * @returns #TRUE if uid is filled in with a valid user ID */ -#ifdef ENABLE_KDBUS_TRANSPORT -dbus_bool_t -dbus_connection_get_unix_user_dbus (DBusConnection *connection, - unsigned long *uid) -#else dbus_bool_t dbus_connection_get_unix_user (DBusConnection *connection, unsigned long *uid) -#endif { dbus_bool_t result; @@ -5271,16 +5266,26 @@ dbus_connection_get_unix_user (DBusConnection *connection, CONNECTION_LOCK (connection); - if (!_dbus_transport_try_to_authenticate (connection->transport)) - result = FALSE; +#ifdef ENABLE_KDBUS_TRANSPORT + if (_dbus_connection_get_address (connection) != NULL) + { + if (!strncmp (_dbus_connection_get_address (connection), "kdbus:", strlen("kdbus:"))) + result = kdbus_connection_get_unix_user (connection, dbus_bus_get_unique_name (connection), uid, NULL); + } else - result = _dbus_transport_get_unix_user (connection->transport, - uid); +#endif + { + if (!_dbus_transport_try_to_authenticate (connection->transport)) + result = FALSE; + else + result = _dbus_transport_get_unix_user (connection->transport, + uid); + } #ifdef DBUS_WIN _dbus_assert (!result); #endif - + CONNECTION_UNLOCK (connection); return result; @@ -5296,15 +5301,9 @@ dbus_connection_get_unix_user (DBusConnection *connection, * @param pid return location for the process ID * @returns #TRUE if uid is filled in with a valid process ID */ -#ifdef ENABLE_KDBUS_TRANSPORT -dbus_bool_t -dbus_connection_get_unix_process_id_dbus (DBusConnection *connection, - unsigned long *pid) -#else dbus_bool_t dbus_connection_get_unix_process_id (DBusConnection *connection, unsigned long *pid) -#endif { dbus_bool_t result; @@ -5313,11 +5312,21 @@ dbus_connection_get_unix_process_id (DBusConnection *connection, CONNECTION_LOCK (connection); - if (!_dbus_transport_try_to_authenticate (connection->transport)) - result = FALSE; +#ifdef ENABLE_KDBUS_TRANSPORT + if (_dbus_connection_get_address (connection) != NULL) + { + if (!strncmp (_dbus_connection_get_address (connection), "kdbus:", strlen("kdbus:"))) + result = kdbus_connection_get_unix_process_id (connection, dbus_bus_get_unique_name (connection), pid, NULL); + } else - result = _dbus_transport_get_unix_process_id (connection->transport, - pid); +#endif + { + if (!_dbus_transport_try_to_authenticate (connection->transport)) + result = FALSE; + else + result = _dbus_transport_get_unix_process_id (connection->transport, + pid); + } CONNECTION_UNLOCK (connection); diff --git a/dbus/kdbus-common.c b/dbus/kdbus-common.c index e0e6305..837ed91 100644 --- a/dbus/kdbus-common.c +++ b/dbus/kdbus-common.c @@ -231,3 +231,156 @@ int release_kdbus_name(int fd, const char *name, __u64 id) return DBUS_RELEASE_NAME_REPLY_RELEASED; } + +/** + * Performs kdbus query of id of the given name + * + * @param name name to query for + * @param transport transport + * @param pInfo nameInfo structure address to store info about the name + * @return 0 on success, -errno if failed + */ +int kdbus_NameQuery(const char* name, DBusTransport* transport, struct nameInfo* pInfo) +{ + struct kdbus_cmd_conn_info *cmd; + int ret; + int fd; + uint64_t size; + __u64 id = 0; + + memset(pInfo, 0, sizeof(struct nameInfo)); + + if(!_dbus_transport_get_socket_fd(transport, &fd)) + return -EPERM; + + size = sizeof(struct kdbus_cmd_conn_info); + if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ + id = strtoull(&name[3], NULL, 10); + if(id == 0) + size += strlen(name) + 1; + + cmd = alloca(size); + if (!cmd) + { + _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); + return -errno; + } + + memset(cmd, 0, sizeof(struct kdbus_cmd_conn_info)); + cmd->size = size; + cmd->id = id; + if(id == 0) + memcpy(cmd->name, name, strlen(name) + 1); + + again: + ret = ioctl(fd, KDBUS_CMD_CONN_INFO, cmd); + if (ret < 0) + { + if(errno == EINTR) + goto again; + pInfo->uniqueId = 0; + return -errno; + } + else + { + struct kdbus_conn_info *info; + struct kdbus_item *item; + + info = (struct kdbus_conn_info *)((char*)dbus_transport_get_pool_pointer(transport) + cmd->offset); + pInfo->uniqueId = info->id; + + item = info->items; + while((uint8_t *)(item) < (uint8_t *)(info) + info->size) + { + if(item->type == KDBUS_ITEM_CREDS) + { + pInfo->userId = item->creds.uid; + pInfo->processId = item->creds.pid; + } + + if(item->type == KDBUS_ITEM_SECLABEL) + { + pInfo->sec_label_len = item->size - KDBUS_ITEM_HEADER_SIZE - 1; + if(pInfo->sec_label_len != 0) + { + pInfo->sec_label = malloc(pInfo->sec_label_len); + if(pInfo->sec_label == NULL) + ret = -1; + else + memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); + } + } + + item = KDBUS_PART_NEXT(item); + } + + again2: + if (ioctl(fd, KDBUS_CMD_FREE, &cmd->offset) < 0) + { + if(errno == EINTR) + goto again2; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + return -errno; + } + } + + return ret; +} + +/* + * Asks kdbus for uid of the owner of the name given in the message + */ +dbus_bool_t kdbus_connection_get_unix_user(DBusConnection* connection, const char* name, unsigned long* uid, DBusError* error) +{ + struct nameInfo info; + int inter_ret; + dbus_bool_t ret = FALSE; + + inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); + if(inter_ret == 0) //name found + { + _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); + *uid = info.userId; + return TRUE; + } + else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner + { + _dbus_verbose ("Name %s has no owner.\n", name); + dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get UID of name '%s': no such name", name); + } + + else + { + _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); + dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name); + } + + return ret; +} + +/* + * Asks kdbus for pid of the owner of the name given in the message + */ +dbus_bool_t kdbus_connection_get_unix_process_id(DBusConnection* connection, const char* name, unsigned long* pid, DBusError* error) +{ + struct nameInfo info; + int inter_ret; + dbus_bool_t ret = FALSE; + + inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); + if(inter_ret == 0) //name found + { + _dbus_verbose("Process id:%llu\n", (unsigned long long) info.processId); + *pid = info.processId; + return TRUE; + } + else if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner + dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get PID of name '%s': no such name", name); + else + { + _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); + dbus_set_error (error, DBUS_ERROR_FAILED, "Could not determine PID for '%s'", name); + } + + return ret; +} diff --git a/dbus/kdbus-common.h b/dbus/kdbus-common.h index 14b62af..4b84a31 100644 --- a/dbus/kdbus-common.h +++ b/dbus/kdbus-common.h @@ -41,7 +41,19 @@ //todo restore if DBus policy will be applied in kdbus somehow //#define POLICY_TO_KDBUS -dbus_bool_t register_kdbus_policy(const char* name, DBusTransport *transport, unsigned long int uid); +struct nameInfo +{ + __u64 uniqueId; + __u64 userId; + __u64 processId; + __u32 sec_label_len; + char *sec_label; +}; +int kdbus_NameQuery(const char *name, DBusTransport *transport, struct nameInfo *pInfo); +dbus_bool_t kdbus_connection_get_unix_user(DBusConnection *connection, const char *name, unsigned long *uid, DBusError *error); +dbus_bool_t kdbus_connection_get_unix_process_id(DBusConnection *connection, const char *name, unsigned long *uid, DBusError *error); + +dbus_bool_t register_kdbus_policy(const char *name, DBusTransport *transport, unsigned long int uid); int request_kdbus_name(int fd, const char *name, const __u64 flags, __u64 id); int release_kdbus_name(int fd, const char *name, __u64 id); -- 2.7.4