X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=58a2cb4d3e3d06d510927b57b414f37bc3af425c;hp=1d8b8b34d2c9ff06eeca3f0aff9584443528540c;hb=e2258e6ee3c933351f81490bac576438ff973ae4;hpb=5e20183e0a2264e0aed972ceff913374ab970248

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 1d8b8b3..58a2cb4 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
 #include "sysdb.h"
 #include "core/object.h"
 #include "core/plugin.h"
@@ -32,6 +36,7 @@
 #include "utils/error.h"
 #include "utils/strbuf.h"
 #include "utils/proto.h"
+#include "utils/os.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -42,6 +47,19 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/param.h>
+
+#ifdef HAVE_UCRED_H
+#	include <ucred.h>
+#endif
+#ifdef HAVE_SYS_UCRED_H
+#	include <sys/ucred.h>
+#endif
+
+#include <pwd.h>
+
 #include <pthread.h>
 
 /*
@@ -49,7 +67,7 @@
  */
 
 static pthread_key_t conn_ctx_key;
-static _Bool         conn_ctx_key_initialized = 0;
+static bool          conn_ctx_key_initialized = 0;
 
 /*
  * private types
@@ -59,6 +77,36 @@ static _Bool         conn_ctx_key_initialized = 0;
 #define CONN_FD_PREFIX "conn#"
 #define CONN_FD_PLACEHOLDER "XXXXXXX"
 
+/* XXX: only supports UNIX sockets so far */
+static char *
+peer(int sockfd)
+{
+	uid_t uid;
+
+	struct passwd pw_entry;
+	struct passwd *result = NULL;
+	char buf[1024];
+
+#ifdef SO_PEERCRED
+	struct ucred cred;
+	socklen_t len = sizeof(cred);
+
+	if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &len)
+			|| (len != sizeof(cred)))
+		return NULL;
+	uid = cred.uid;
+#else /* SO_PEERCRED */
+	errno = ENOSYS;
+	return NULL;
+#endif
+
+	memset(&pw_entry, 0, sizeof(pw_entry));
+	if (getpwuid_r(uid, &pw_entry, buf, sizeof(buf), &result)
+			|| (! result))
+		return NULL;
+	return strdup(result->pw_name);
+} /* peer */
+
 static int
 connection_init(sdb_object_t *obj, va_list ap)
 {
@@ -111,6 +159,16 @@ connection_init(sdb_object_t *obj, va_list ap)
 		return -1;
 	}
 
+	conn->username = peer(conn->fd);
+	if (! conn->username) {
+		char buf[1024];
+		sdb_log(SDB_LOG_ERR, "frontend: Failed to retrieve peer for "
+				"connection conn#%i: %s", conn->fd,
+				sdb_strerror(errno, buf, sizeof(buf)));
+		return -1;
+	}
+	conn->ready = 0;
+
 	sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
 			conn->fd);
 
@@ -405,12 +463,10 @@ sdb_connection_close(sdb_conn_t *conn)
 	if (conn->fd >= 0)
 		close(conn->fd);
 	conn->fd = -1;
-
-	sdb_object_deref(SDB_OBJ(conn));
 } /* sdb_connection_close */
 
 ssize_t
-sdb_connection_read(sdb_conn_t *conn)
+sdb_connection_handle(sdb_conn_t *conn)
 {
 	ssize_t n = 0;
 
@@ -441,18 +497,21 @@ sdb_connection_read(sdb_conn_t *conn)
 
 	sdb_conn_set_ctx(NULL);
 	return n;
-} /* sdb_connection_read */
+} /* sdb_connection_handle */
 
 ssize_t
 sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 		uint32_t msg_len, const char *msg)
 {
+	char buf[2 * sizeof(uint32_t) + msg_len];
 	ssize_t status;
 
 	if ((! conn) || (conn->fd < 0))
 		return -1;
+	if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
+		return -1;
 
-	status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+	status = sdb_write(conn->fd, sizeof(buf), buf);
 	if (status < 0) {
 		char errbuf[1024];