summaryrefslogtreecommitdiffstats
path: root/src/sbus
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-05-09 20:03:02 +0200
committerJakub Hrozek <jhrozek@redhat.com>2014-05-13 21:46:46 +0200
commit0161a3c5637a0c0092bf54c436bb3d6508d7df26 (patch)
tree5d057559f2b8345608a422e1f544c446ba420b52 /src/sbus
parentb81ad4a7c59cade13d52216f805d904392627136 (diff)
downloadsssd-0161a3c5637a0c0092bf54c436bb3d6508d7df26.tar.gz
sssd-0161a3c5637a0c0092bf54c436bb3d6508d7df26.tar.xz
sssd-0161a3c5637a0c0092bf54c436bb3d6508d7df26.zip
SBUS: Add an async request to retrieve the caller ID
Adds an async request sbus_get_sender_id_{send,recv} that allows retrieval of UID based on "sender" as returned by dbus_message_get_sender(). The UID is an int64_t to be able to use "-1" to as a fallback value for uknown or error cases. The unit test is added as a standalone one, not part of the sbus_tests because the request, and by extension the unit test relies on being connected to the system bus, which is very unlikely to work in a build system. Reviewed-by: Pavel Březina <pbrezina@redhat.com> Reviewed-by: Stef Walter <stefw@redhat.com>
Diffstat (limited to 'src/sbus')
-rw-r--r--src/sbus/sssd_dbus.h2
-rw-r--r--src/sbus/sssd_dbus_connection.c7
-rw-r--r--src/sbus/sssd_dbus_private.h11
-rw-r--r--src/sbus/sssd_dbus_request.c201
4 files changed, 221 insertions, 0 deletions
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index 8ba108ee3..15ca52118 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -27,6 +27,7 @@ struct sbus_interface;
struct sbus_request;
#include <dbus/dbus.h>
+#include <sys/types.h>
#include "util/util.h"
typedef int (*sbus_msg_handler_fn)(struct sbus_request *dbus_req,
@@ -187,6 +188,7 @@ void sbus_conn_send_reply(struct sbus_connection *conn,
* or sbus_request_fail() functions.
*/
struct sbus_request {
+ int64_t client;
struct sbus_connection *conn;
DBusMessage *message;
struct sbus_interface *intf;
diff --git a/src/sbus/sssd_dbus_connection.c b/src/sbus/sssd_dbus_connection.c
index 58005c238..288fa1f49 100644
--- a/src/sbus/sssd_dbus_connection.c
+++ b/src/sbus/sssd_dbus_connection.c
@@ -174,6 +174,13 @@ int sbus_init_connection(TALLOC_CTX *ctx,
conn->dbus.conn = dbus_conn;
conn->connection_type = connection_type;
+ ret = sss_hash_create(conn, 32, &conn->clients);
+ if (ret != EOK) {
+ DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create clients hash table\n");
+ talloc_free(conn);
+ return EIO;
+ }
+
ret = sbus_conn_set_fns(conn);
if (ret != EOK) {
talloc_free(conn);
diff --git a/src/sbus/sssd_dbus_private.h b/src/sbus/sssd_dbus_private.h
index 58b385b71..65189b5ff 100644
--- a/src/sbus/sssd_dbus_private.h
+++ b/src/sbus/sssd_dbus_private.h
@@ -22,6 +22,8 @@
#ifndef _SSSD_DBUS_PRIVATE_H_
#define _SSSD_DBUS_PRIVATE_H_
+#include <dhash.h>
+
#include "sssd_dbus_meta.h"
union dbus_conn_pointer {
@@ -60,6 +62,7 @@ struct sbus_connection {
char *symlink;
sbus_server_conn_init_fn srv_init_fn;
void *srv_init_data;
+ hash_table_t *clients;
/* watches list */
struct sbus_watch_ctx *watch_list;
@@ -126,4 +129,12 @@ int sss_dbus_conn_send(DBusConnection *dbus_conn,
void *pvt,
DBusPendingCall **pending);
+
+/* =Retrieve-conn-credentials=============================================== */
+struct tevent_req *sbus_get_sender_id_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct sbus_connection *conn,
+ const char *sender);
+int sbus_get_sender_id_recv(struct tevent_req *req, int64_t *_uid);
+
#endif /* _SSSD_DBUS_PRIVATE_H_ */
diff --git a/src/sbus/sssd_dbus_request.c b/src/sbus/sssd_dbus_request.c
index 0021ce0e9..2d23931aa 100644
--- a/src/sbus/sssd_dbus_request.c
+++ b/src/sbus/sssd_dbus_request.c
@@ -276,3 +276,204 @@ sbus_request_parse_or_finish(struct sbus_request *request,
return ret;
}
+
+struct sbus_get_sender_id_state {
+ struct sbus_connection *conn;
+ DBusConnection *sysbus_conn;
+ char *sender;
+ int64_t uid;
+};
+
+static void sbus_get_sender_id_done(DBusPendingCall *pending, void *ptr);
+
+struct tevent_req *sbus_get_sender_id_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct sbus_connection *conn,
+ const char *sender)
+{
+ struct tevent_req *req;
+ struct sbus_get_sender_id_state *state;
+ DBusError dbus_error;
+ DBusMessage *msg = NULL;
+ dbus_bool_t dbret;
+ errno_t ret;
+ hash_key_t key;
+ hash_value_t value;
+
+ req = tevent_req_create(mem_ctx, &state, struct sbus_get_sender_id_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state->conn = conn;
+ state->uid = -1;
+
+ if (conn->connection_type != SBUS_CONN_TYPE_SYSBUS) {
+ DEBUG(SSSDBG_TRACE_INTERNAL, "Not a sysbus message, quit\n");
+ ret = EOK;
+ goto immediate;
+ }
+
+ if (sender == NULL) {
+ ret = ERR_SBUS_NO_SENDER;
+ goto immediate;
+ }
+
+ state->sender = talloc_strdup(state, sender);
+ if (state->sender == NULL) {
+ ret = ENOMEM;
+ goto immediate;
+ }
+
+ key.type = HASH_KEY_STRING;
+ key.str = discard_const(sender);
+ ret = hash_lookup(conn->clients, &key, &value);
+ if (ret == HASH_SUCCESS) {
+ DEBUG(SSSDBG_TRACE_INTERNAL,
+ "%s already present in the clients table\n", sender);
+ state->uid = (int64_t) value.ul;
+ ret = EOK;
+ goto immediate;
+ } else if (ret != HASH_ERROR_KEY_NOT_FOUND) {
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ "Failed to look up %s in the clients table\n", sender);
+ ret = ERR_SBUS_GET_SENDER_ERROR;
+ goto immediate;
+ }
+
+ /* We don't know this sender yet, let's ask the system bus */
+
+ /* Connect to the well-known system bus */
+ dbus_error_init(&dbus_error);
+ state->sysbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error);
+ if (state->sysbus_conn == NULL) {
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ "Failed to connect to D-BUS system bus.\n");
+ ret = ERR_SBUS_GET_SENDER_ERROR;
+ goto immediate;
+ }
+ dbus_connection_set_exit_on_disconnect(state->sysbus_conn, FALSE);
+
+ /* If we ever need to get the SELinux context or the PID here, we need
+ * to call GetConnectionCredentials instead
+ */
+ msg = dbus_message_new_method_call("org.freedesktop.DBus", /* bus name */
+ "/org/freedesktop/DBus", /* path */
+ "org.freedesktop.DBus", /* interface */
+ "GetConnectionUnixUser");
+ if (msg == NULL) {
+ DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory?!\n");
+ ret = ENOMEM;
+ goto immediate;
+ }
+
+ dbret = dbus_message_append_args(msg,
+ DBUS_TYPE_STRING, &sender,
+ DBUS_TYPE_INVALID);
+ if (!dbret) {
+ goto immediate;
+ }
+
+ ret = sss_dbus_conn_send(state->sysbus_conn, msg, 3000,
+ sbus_get_sender_id_done,
+ req, NULL);
+ dbus_message_unref(msg);
+ msg = NULL;
+ if (ret != EOK) {
+ goto immediate;
+ }
+
+ return req;
+
+immediate:
+ if (ret == EOK) {
+ tevent_req_done(req);
+ } else {
+ if (msg != NULL) {
+ dbus_message_unref(msg);
+ }
+ if (state->sysbus_conn != NULL) {
+ dbus_connection_unref(state->sysbus_conn);
+ }
+ tevent_req_error(req, ret);
+ }
+ tevent_req_post(req, ev);
+ return req;
+}
+
+static void sbus_get_sender_id_done(DBusPendingCall *pending, void *ptr)
+{
+ struct tevent_req *req;
+ struct sbus_get_sender_id_state *state;
+ DBusMessage *reply;
+ DBusError dbus_error;
+ hash_key_t key;
+ hash_value_t value;
+ dbus_bool_t dbret;
+ int ret;
+ uid_t uid;
+
+ dbus_error_init(&dbus_error);
+
+ req = talloc_get_type(ptr, struct tevent_req);
+ state = tevent_req_data(req, struct sbus_get_sender_id_state);
+
+ reply = dbus_pending_call_steal_reply(pending);
+ if (!reply) {
+ /* reply should never be null. This function shouldn't be called
+ * until reply is valid or timeout has occurred. If reply is NULL
+ * here, something is seriously wrong and we should bail out.
+ */
+ DEBUG(SSSDBG_CRIT_FAILURE,
+ "Severe error. A reply callback was called but no reply "
+ "was received and no timeout occurred\n");
+
+ ret = EIO;
+ goto done;
+ }
+
+ dbret = dbus_message_get_args(reply,
+ &dbus_error,
+ DBUS_TYPE_UINT32, &uid,
+ DBUS_TYPE_INVALID);
+ if (!dbret) {
+ ret = EIO;
+ goto done;
+ }
+
+ state->uid = uid;
+
+ key.type = HASH_KEY_STRING;
+ key.str = talloc_steal(state->conn->clients, state->sender);
+ value.type = HASH_VALUE_UINT;
+ value.ul = state->uid;
+ ret = hash_enter(state->conn->clients, &key, &value);
+ if (ret != HASH_SUCCESS) {
+ ret = EIO;
+ goto done;
+ }
+
+ ret = EOK;
+done:
+ dbus_pending_call_unref(pending);
+ dbus_message_unref(reply);
+ dbus_connection_unref(state->sysbus_conn);
+ if (ret != EOK) {
+ tevent_req_error(req, ret);
+ } else {
+ tevent_req_done(req);
+ }
+}
+
+int sbus_get_sender_id_recv(struct tevent_req *req, int64_t *_uid)
+{
+ struct sbus_get_sender_id_state *state = \
+ tevent_req_data(req, struct sbus_get_sender_id_state);
+
+ TEVENT_REQ_RETURN_ON_ERROR(req);
+
+ if (_uid) {
+ *_uid = state->uid;
+ }
+
+ return EOK;
+}