X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fkdbus-d.c;h=a0975fdac998d6e37ff351490a12a447c992560f;hb=c1a77d2c58c78abc606f1cb7918704596ebf2bfe;hp=1f56bc3f0201dee8af7b1435eef1520fd6e140ad;hpb=05902801b49789f37426754fc6b77f3665afe3b0;p=platform%2Fupstream%2Fdbus.git diff --git a/bus/kdbus-d.c b/bus/kdbus-d.c index 1f56bc3..a0975fd 100644 --- a/bus/kdbus-d.c +++ b/bus/kdbus-d.c @@ -23,18 +23,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - #include #include "kdbus-d.h" #include #include #include "dispatch.h" -#include #include #include #include "connection.h" #include "activation.h" #include "services.h" +#include #include #include @@ -43,6 +42,9 @@ #include #include +/* + * Converts string with unique name into __u64 id number. If the name is not unique, sets error. + */ __u64 sender_name_to_id(const char* name, DBusError* error) { __u64 sender_id = 0; @@ -55,110 +57,364 @@ __u64 sender_name_to_id(const char* name, DBusError* error) return sender_id; } -char* make_kdbus_bus(DBusBusType type, DBusError *error) +/** + * Seeks key in rule string, and duplicates value of the key into pValue. + * Because of the duplication, pValue must be freed after use. + * + * @param rule rule to look through + * @param key key to look for + * @param pValue pointer to value of the key found + * @return length of the value string, 0 means not found + */ +static int parse_match_key(const char *rule, const char* key, char** pValue) { - struct { - struct kdbus_cmd_bus_make head; - uint64_t n_size; - uint64_t n_type; - char name[64]; - } __attribute__ ((__aligned__(8))) bus_make; - - int fdc, ret; - char *bus; - - _dbus_verbose("Opening /dev/kdbus/control\n"); - fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); - if (fdc < 0) + const char* pBegin; + const char* pValueEnd; + int value_length = 0; + + pBegin = strstr(rule, key); + if(pBegin) + { + pBegin += strlen(key); + pValueEnd = strchr(pBegin, '\''); + if(pValueEnd) { - _dbus_verbose("--- error %d (%m)\n", fdc); - dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc); - return NULL; + value_length = pValueEnd - pBegin; + *pValue = strndup(pBegin, value_length); + if(*pValue) + _dbus_verbose ("found for key: %s value:'%s'\n", key, *pValue); } + } + return value_length; +} - memset(&bus_make, 0, sizeof(bus_make)); - bus_make.head.bloom_size = 64; - bus_make.head.flags = KDBUS_MAKE_ACCESS_WORLD; - - if(type == DBUS_BUS_SYSTEM) - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%s", getuid(), "system"); - else if(type == DBUS_BUS_SESSION) - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus", getuid()); +/** + * Adds a match rule to match broadcast messages going through the message bus. + * Do no affect messages addressed directly. + * + * The "rule" argument is the string form of a match rule. + * + * Only part of the dbus's matching capabilities is implemented in kdbus now, because of different mechanism. + * Current mapping: + * interface match key mapped to bloom + * sender match key mapped to src_name + * + * @param transport transport + * @param id id of connection for which the rule is to be added + * @param rule textual form of match rule + */ +dbus_bool_t add_match_kdbus (DBusTransport* transport, __u64 id, const char *rule) +{ + struct kdbus_cmd_match* pCmd_match; + struct kdbus_item *pItem; + __u64 src_id = KDBUS_MATCH_SRC_ID_ANY; + uint64_t size; + int name_size; + char* pName = NULL; + char* pInterface = NULL; + dbus_bool_t ret_value = FALSE; + int fd; + __u64 bloom_size; + + if(!_dbus_transport_get_socket_fd(transport, &fd)) + return FALSE; + + bloom_size = dbus_transport_get_bloom_size(transport); + + /*parsing rule and calculating size of command*/ + size = sizeof(struct kdbus_cmd_match); + if(parse_match_key(rule, "interface='", &pInterface)) /*actual size is not important for interface because bloom size is defined by bus*/ + size += KDBUS_ITEM_HEADER_SIZE + bloom_size; + name_size = parse_match_key(rule, "sender='", &pName); + if(name_size) + { + if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/ + { + src_id = strtoull(&pName[3], NULL, 10); + free(pName); + pName = NULL; + } else - snprintf(bus_make.name, sizeof(bus_make.name), "%u-kdbus-%u", getuid(), getpid()); + size += KDBUS_ITEM_SIZE(name_size + 1); //well known name + } + + pCmd_match = alloca(size); + if(pCmd_match == NULL) + goto out; + + pCmd_match->id = id; + pCmd_match->cookie = id; + pCmd_match->size = size; + pCmd_match->src_id = src_id; + + pItem = pCmd_match->items; + if(pName) + { + pItem->type = KDBUS_MATCH_SRC_NAME; + pItem->size = KDBUS_ITEM_HEADER_SIZE + name_size + 1; + memcpy(pItem->str, pName, strlen(pName) + 1); + pItem = KDBUS_PART_NEXT(pItem); + } + if(pInterface) + { + pItem->type = KDBUS_MATCH_BLOOM; + pItem->size = KDBUS_ITEM_HEADER_SIZE + bloom_size; + strncpy(pItem->data, pInterface, bloom_size); + } + + if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) + _dbus_verbose("Failed adding match bus rule %s,\nerror: %d, %m\n", rule, errno); + else + { + _dbus_verbose("Added match bus rule %s for id:%llu\n", rule, (unsigned long long)id); + ret_value = TRUE; + } + +out: + if(pName) + free(pName); + if(pInterface) + free(pInterface); + return ret_value; +} + +/** + * Opposing to dbus, in kdbus removes all match rules with given + * cookie, which in this implementation is equal to uniqe id. + * + * @param transport transport + * @param id connection id for which rules are to be removed + */ +dbus_bool_t remove_match_kdbus (DBusTransport* transport, __u64 id) +{ + struct kdbus_cmd_match __attribute__ ((__aligned__(8))) cmd; + int fd; + + if(!_dbus_transport_get_socket_fd(transport, &fd)) + return FALSE; + + cmd.cookie = id; + cmd.id = id; + cmd.size = sizeof(struct kdbus_cmd_match); + + if(ioctl(fd, KDBUS_CMD_MATCH_REMOVE, &cmd)) + { + _dbus_verbose("Failed removing match rule for id: %llu; error: %d, %m\n", (unsigned long long)id, errno); + return FALSE; + } + else + { + _dbus_verbose("Match rule removed correctly.\n"); + return TRUE; + } +} - bus_make.n_type = KDBUS_MAKE_NAME; - bus_make.n_size = KDBUS_PART_HEADER_SIZE + strlen(bus_make.name) + 1; - bus_make.head.size = sizeof(struct kdbus_cmd_bus_make) + bus_make.n_size; +/* + * Creates kdbus bus of given type. + */ +char* make_kdbus_bus(DBusBusType type, const char* address, DBusError *error) +{ + // TODO Function alloca() used. In upstream there was a patch proposing to + // replace alloca() with malloc() to assure memory alignment. If there will be + // suggestion to use malloc instead of alloca this function has to be modified + struct kdbus_cmd_make *bus_make; + struct kdbus_item *item; + __u64 name_size, bus_make_size; + int fdc, ret; + char *addr_value = NULL; + char *bus = NULL; + char *name = NULL; + + if(type == DBUS_BUS_SYSTEM) + name_size = snprintf(name, 0, "%u-kdbus-%s", getuid(), "system") + 1; + else if(type == DBUS_BUS_SESSION) + name_size = snprintf(name, 0, "%u-kdbus", getuid()) + 1; + else + name_size = snprintf(name, 0, "%u-kdbus-%u", getuid(), getpid()) + 1; + + name = alloca(name_size); + if (!name) + { + return NULL; + } - _dbus_verbose("Creating bus '%s'\n", bus_make.name); - ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, &bus_make); - if (ret) + bus_make_size = sizeof(struct kdbus_cmd_make) + KDBUS_ITEM_SIZE(name_size) + KDBUS_ITEM_SIZE(sizeof(__u64)); + bus_make = alloca(bus_make_size); + if (!bus_make) { - _dbus_verbose("--- error %d (%m)\n", ret); - dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)", bus_make.name, fdc); - return NULL; + return NULL; + } + + bus_make->size = bus_make_size; +#ifdef POLICY_TO_KDBUS + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD; +#else + bus_make->flags = KDBUS_MAKE_ACCESS_WORLD | KDBUS_MAKE_POLICY_OPEN; +#endif + item = bus_make->items; + + item->type = KDBUS_ITEM_MAKE_NAME; + item->size = KDBUS_ITEM_HEADER_SIZE + name_size; + if(type == DBUS_BUS_SYSTEM) + sprintf(name, "%u-kdbus-%s", getuid(), "system"); + else if(type == DBUS_BUS_SESSION) + sprintf(name, "%u-kdbus", getuid()); + else + sprintf(name, "%u-kdbus-%u", getuid(), getpid()); + memcpy((bus_make->items)->str, name, name_size); + + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_BLOOM_SIZE; + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + item->data64[0] = 64; + +#ifdef KDBUS_FOR_SBB + addr_value = strchr(address, ':') + 1; + if(*addr_value) + { + if(!strcmp(addr_value, "sbb")) + bus_make->flags |= KDBUS_MAKE_SBB_OFFSET; + else + { + dbus_set_error_const(error, DBUS_ERROR_BAD_ADDRESS, "Invalid address parameter."); + return NULL; + } } +#endif - if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", bus_make.name) < 0) + _dbus_verbose("Opening /dev/kdbus/control\n"); + fdc = open("/dev/kdbus/control", O_RDWR|O_CLOEXEC); + if (fdc < 0) { - BUS_SET_OOM (error); - return NULL; + _dbus_verbose("--- error %d (%m)\n", fdc); + dbus_set_error(error, DBUS_ERROR_FAILED, "Opening /dev/kdbus/control failed: %d (%m)", fdc); + return NULL; } - _dbus_verbose("Return value '%s'\n", bus); - return bus; + _dbus_verbose("Creating bus '%s'\n", (bus_make->items[0]).str); + ret = ioctl(fdc, KDBUS_CMD_BUS_MAKE, bus_make); + if (ret) + { + _dbus_verbose("--- error %d (%m)\n", errno); + dbus_set_error(error, DBUS_ERROR_FAILED, "Creating bus '%s' failed: %d (%m)", + (bus_make->items[0]).str, errno); + return NULL; + } + + if (asprintf(&bus, "kdbus:path=/dev/kdbus/%s/bus", (bus_make->items[0]).str) < 0) + { + BUS_SET_OOM (error); + return NULL; + } + + _dbus_verbose("Return value '%s'\n", bus); + return bus; } +/* + * Minimal server init needed by context to go further. + */ DBusServer* empty_server_init(char* address) { return dbus_server_init_mini(address); } -DBusConnection* daemon_as_client(DBusBusType type, char* address, DBusError *error) +static dbus_bool_t add_matches_for_kdbus_broadcasts(DBusConnection* connection) { - DBusConnection* connection; - - dbus_bus_set_bus_connection_address(type, address); + struct kdbus_cmd_match* pCmd_match; + struct kdbus_item *pItem; + uint64_t size; + int fd; + DBusTransport *transport; - connection = dbus_bus_get_private(type, error); /*todo possibly could be optimised by using lower functions*/ - if(connection == NULL) - return NULL; + transport = dbus_connection_get_transport(connection); - if(!add_match_kdbus (dbus_connection_get_transport(connection), 1, "member='IdRemoved'")) + if(!_dbus_transport_get_socket_fd(transport, &fd)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:1, %s", _dbus_strerror_from_errno ()); - goto failed; + errno = EPERM; + return FALSE; } - if(!add_match_kdbus (dbus_connection_get_transport(connection), 1, "member='NameChanged'")) + + size = sizeof(struct kdbus_cmd_match); + size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /*3 name related items plus 2 id related items*/ + + pCmd_match = alloca(size); + if(pCmd_match == NULL) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:1, %s", _dbus_strerror_from_errno ()); - goto failed; + errno = ENOMEM; + return FALSE; } - if(!add_match_kdbus (dbus_connection_get_transport(connection), 1, "member='NameLost'")) + + pCmd_match->id = 0; + pCmd_match->cookie = 1; + pCmd_match->size = size; + pCmd_match->src_id = 0; + + pItem = pCmd_match->items; + pItem->type = KDBUS_MATCH_NAME_CHANGE; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_NAME_ADD; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_NAME_REMOVE; + pItem->size = KDBUS_ITEM_HEADER_SIZE + 1; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_ID_ADD; + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; + pItem = KDBUS_PART_NEXT(pItem); + pItem->type = KDBUS_MATCH_ID_REMOVE; + pItem->size = KDBUS_ITEM_HEADER_SIZE + sizeof(__u64); + pItem->id = KDBUS_MATCH_SRC_ID_ANY; + + if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:1, %s", _dbus_strerror_from_errno ()); - goto failed; + _dbus_verbose("Failed adding match rule for daemon, error: %d, %m\n", errno); + return FALSE; } - if(!add_match_kdbus (dbus_connection_get_transport(connection), 1, "member='NameAcquired'")) + + _dbus_verbose("Added match rule for daemon correctly.\n"); + return TRUE; +} + +/* + * Connects daemon to bus created by him and adds matches for "system" broadcasts. + * Do not requests org.freedesktop.DBus name, because it's to early + * (some structures of BusContext are not ready yet). + */ +DBusConnection* daemon_as_client(DBusBusType type, char* address, DBusError *error) +{ + DBusConnection* connection; + + dbus_bus_set_bus_connection_address(type, address); + + connection = dbus_bus_get_private(type, error); /*todo possibly could be optimised by using lower functions*/ + if(connection == NULL) + return NULL; + + if(!add_matches_for_kdbus_broadcasts(connection)) { - dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for id:1, %s", _dbus_strerror_from_errno ()); - goto failed; + dbus_set_error (error, _dbus_error_from_errno (errno), "Could not add match for daemon, %s", _dbus_strerror_from_errno ()); + goto failed; } - if(dbus_error_is_set(error)) - { -failed: - _dbus_connection_close_possibly_shared (connection); - dbus_connection_unref (connection); - connection = NULL; - } - else - _dbus_verbose ("Daemon connected as kdbus client.\n"); + if(dbus_error_is_set(error)) + { + failed: + _dbus_connection_close_possibly_shared (connection); + dbus_connection_unref (connection); + connection = NULL; + } + else + _dbus_verbose ("Daemon connected as kdbus client.\n"); - return connection; + return connection; } +/* + * Asks bus for org.freedesktop.DBus well-known name. + */ dbus_bool_t register_daemon_name(DBusConnection* connection) { DBusString daemon_name; @@ -166,8 +422,10 @@ dbus_bool_t register_daemon_name(DBusConnection* connection) BusTransaction *transaction; _dbus_string_init_const(&daemon_name, DBUS_SERVICE_DBUS); - if(!kdbus_register_policy (&daemon_name, connection)) - return FALSE; +#ifdef POLICY_TO_KDBUS + if(!register_kdbus_policy(DBUS_SERVICE_DBUS, dbus_connection_get_transport(connection), geteuid())) + return FALSE; +#endif if(kdbus_request_name(connection, &daemon_name, 0, 0) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) return FALSE; @@ -188,17 +446,12 @@ dbus_bool_t register_daemon_name(DBusConnection* connection) retval = TRUE; out: - bus_transaction_cancel_and_free(transaction); - return retval; -} - -dbus_bool_t kdbus_register_policy (const DBusString *service_name, DBusConnection* connection) -{ - int fd; - - _dbus_transport_get_socket_fd(dbus_connection_get_transport(connection), &fd); + if(retval) + bus_transaction_execute_and_free(transaction); + else + bus_transaction_cancel_and_free(transaction); - return register_kdbus_policy(_dbus_string_get_const_data(service_name), fd); + return retval; } dbus_uint32_t kdbus_request_name(DBusConnection* connection, const DBusString *service_name, dbus_uint32_t flags, __u64 sender_id) @@ -219,15 +472,196 @@ dbus_uint32_t kdbus_release_name(DBusConnection* connection, const DBusString *s return release_kdbus_name(fd, _dbus_string_get_const_data(service_name), sender_id); } +/* + * Asks kdbus for well-known names registered on the bus + */ dbus_bool_t kdbus_list_services (DBusConnection* connection, char ***listp, int *array_len) { int fd; + struct kdbus_cmd_name_list __attribute__ ((__aligned__(8))) cmd; + struct kdbus_name_list *name_list; + struct kdbus_cmd_name *name; + DBusTransport *transport = dbus_connection_get_transport(connection); + dbus_bool_t ret_val = FALSE; + char** list; + int list_len = 0; + int i = 0; + int j; + + if(!_dbus_transport_get_socket_fd(transport, &fd)) + return FALSE; + + cmd.flags = KDBUS_NAME_LIST_NAMES | KDBUS_NAME_LIST_UNIQUE; + +again: + if(ioctl(fd, KDBUS_CMD_NAME_LIST, &cmd)) + { + if(errno == EINTR) + goto again; + else + { + _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno); + return FALSE; + } + } - _dbus_transport_get_socket_fd(dbus_connection_get_transport(connection), &fd); + name_list = (struct kdbus_name_list *)((char*)dbus_transport_get_pool_pointer(transport) + cmd.offset); + + for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name)) + list_len++; + + _dbus_verbose ("List len: %d\n", list_len); + + list = malloc(sizeof(char*) * (list_len + 1)); + if(list == NULL) + goto out; + + for (name = name_list->names; (uint8_t *)(name) < (uint8_t *)(name_list) + name_list->size; name = KDBUS_PART_NEXT(name)) + { + if(name->size > sizeof(struct kdbus_cmd_name) ) + { + list[i] = strdup(name->name); + if(list[i] == NULL) + goto out; + } + else + { + list[i] = malloc(snprintf(list[i], 0, ":1.%llu0", (unsigned long long)name->id)); + if(list[i] == NULL) + goto out; + sprintf(list[i], ":1.%llu", (unsigned long long int)name->id); + } + _dbus_verbose ("Name %d: %s\n", i, list[i]); + ++i; + } + + list[i] = NULL; + *array_len = list_len; + *listp = list; + ret_val = TRUE; + +out: + if (ioctl(fd, KDBUS_CMD_FREE, &cmd.offset) < 0) + { + if(errno == EINTR) + goto out; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + ret_val = FALSE; + } + if(ret_val == FALSE) + { + for(j=0; jsize = cmd_size; + pCmd->id = 0; + memcpy(pCmd->name, name, name_length); + + _dbus_verbose ("Asking for queued owners of %s\n", pCmd->name); + + _dbus_transport_get_socket_fd(transport, &fd); + + again: + if(ioctl(fd, KDBUS_CMD_NAME_LIST_QUEUED, pCmd)) + { + if(errno == EINTR) + goto again; + else if(errno == ESRCH) + { + dbus_set_error (error, DBUS_ERROR_NAME_HAS_NO_OWNER, + "Could not get owners of name '%s': no such name", name); + return FALSE; + } + else + { + _dbus_verbose("kdbus error asking for queued owners list: err %d (%m)\n",errno); + goto out; + } + } + + name_list = (struct kdbus_name_list *)((char*)dbus_transport_get_pool_pointer(transport) + pCmd->offset); + + for (owner = name_list->names; (uint8_t *)(owner) < (uint8_t *)(name_list) + name_list->size; owner = KDBUS_PART_NEXT(owner)) + { + char *uname = NULL; + + _dbus_verbose ("Got queued owner id: %llu\n", (unsigned long long)owner->id); + uname = malloc(snprintf(uname, 0, ":1.%llu0", (unsigned long long)owner->id)); + if(uname == NULL) + goto out; + sprintf(uname, ":1.%llu", (unsigned long long int)owner->id); + if (!_dbus_list_append (return_list, uname)) + goto out; + } + + ret_val = TRUE; + + out: + if (ioctl(fd, KDBUS_CMD_FREE, &pCmd->offset) < 0) + { + if(errno == EINTR) + goto out; + _dbus_verbose("kdbus error freeing pool: %d (%m)\n", errno); + ret_val = FALSE; + } + if(ret_val == FALSE) + { + DBusList *link; + + dbus_set_error (error, _dbus_error_from_errno (errno), + "Failed to list queued owners of \"%s\": %s", + name, _dbus_strerror (errno)); + + link = _dbus_list_get_first_link (return_list); + while (link != NULL) + { + DBusList *next = _dbus_list_get_next_link (return_list, link); + + if(link->data != NULL) + free(link->data); + + _dbus_list_free_link (link); + link = next; + } + } + + return ret_val; } +/* + * Register match rule in kdbus on behalf of sender of the message + */ dbus_bool_t kdbus_add_match_rule (DBusConnection* connection, DBusMessage* message, const char* text, DBusError* error) { __u64 sender_id; @@ -238,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; } @@ -246,6 +680,9 @@ dbus_bool_t kdbus_add_match_rule (DBusConnection* connection, DBusMessage* messa return TRUE; } +/* + * Removes match rule in kdbus on behalf of sender of the message + */ dbus_bool_t kdbus_remove_match (DBusConnection* connection, DBusMessage* message, DBusError* error) { __u64 sender_id; @@ -256,65 +693,33 @@ 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; } return TRUE; } -dbus_bool_t kdbus_get_connection_unix_user(DBusConnection* connection, DBusMessage* message, unsigned long* uid, DBusError* error) -{ - char* name = NULL; - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - 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) //name has no owner - 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; -} - -dbus_bool_t kdbus_get_connection_unix_process_id(DBusConnection* connection, DBusMessage* message, unsigned long* pid, DBusError* error) +int kdbus_get_name_owner(DBusConnection* connection, const char* name, char* owner) { - char* name = NULL; - struct nameInfo info; - int inter_ret; - dbus_bool_t ret = FALSE; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - 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) //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; + int ret; + struct nameInfo info; + + ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); + if(ret == 0) //unique id of the name + { + sprintf(owner, ":1.%llu", (unsigned long long int)info.uniqueId); + _dbus_verbose("Unique name discovered:%s\n", owner); + } + else if((ret != -ENOENT) && (ret != -ENXIO)) + _dbus_verbose("kdbus error sending name query: err %d (%m)\n", ret); + + 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) { char* name = NULL; @@ -324,7 +729,7 @@ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* c dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); inter_ret = kdbus_NameQuery(name, dbus_connection_get_transport(connection), &info); - if(inter_ret == -ENOENT) //name has no owner + if((inter_ret == -ENOENT) || (inter_ret == -ENXIO)) //name has no owner dbus_set_error (error, DBUS_ERROR_FAILED, "Could not get security context of name '%s': no such name", name); else if(inter_ret < 0) { @@ -344,12 +749,17 @@ dbus_bool_t kdbus_get_connection_unix_selinux_security_context(DBusConnection* c return ret; } -DBusConnection* create_phantom_connection(DBusConnection* connection, const char* unique_name, DBusError* error) +/* + * 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 + * fd so it is set up on the basis of daemon's transport. Functionality of such connection is limited. + */ +DBusConnection* create_phantom_connection(DBusConnection* connection, const char* name, DBusError* error) { DBusConnection *phantom_connection; - DBusString name; + DBusString Sname; - _dbus_string_init_const(&name, unique_name); + _dbus_string_init_const(&Sname, name); phantom_connection = _dbus_connection_new_for_used_transport (dbus_connection_get_transport(connection)); if(phantom_connection == NULL) @@ -358,10 +768,11 @@ DBusConnection* create_phantom_connection(DBusConnection* connection, const char { dbus_connection_unref_phantom(phantom_connection); phantom_connection = NULL; - dbus_set_error (error, DBUS_ERROR_FAILED , "Name \"%s\" could not be acquired", unique_name); + dbus_set_error (error, DBUS_ERROR_FAILED , "Name \"%s\" could not be acquired", name); goto out; } - if(!bus_connection_complete(phantom_connection, &name, error)) + dbus_bus_set_unique_name(phantom_connection, name); + if(!bus_connection_complete(phantom_connection, &Sname, error)) { bus_connection_disconnected(phantom_connection); phantom_connection = NULL; @@ -374,6 +785,9 @@ out: return phantom_connection; } +/* + * Registers activatable services as kdbus starters. + */ dbus_bool_t register_kdbus_starters(DBusConnection* connection) { int i,j, len; @@ -382,6 +796,7 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) int fd; BusTransaction *transaction; DBusString name; + DBusTransport* transport; transaction = bus_transaction_new (bus_connection_get_context(connection)); if (transaction == NULL) @@ -390,21 +805,27 @@ dbus_bool_t register_kdbus_starters(DBusConnection* connection) if (!bus_activation_list_services (bus_connection_get_activation (connection), &services, &len)) return FALSE; - _dbus_transport_get_socket_fd (dbus_connection_get_transport(connection), &fd); + transport = dbus_connection_get_transport(connection); + + if(!_dbus_transport_get_socket_fd (transport, &fd)) + return FALSE; + _dbus_string_init(&name); for(i=0; i