X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=700c84ae42af2e0793b289e82c770807df609e51;hb=2bdb80165c2e095b169c59ef18607b30f8758ec7;hp=55843fd049d9e2569c24b8d42c6d20776039929d;hpb=dc1152ab2cc7b340a0d3a73982516c0dd40c84d3;p=sysdb.git

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 55843fd..700c84a 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -47,19 +47,6 @@
 #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>
 
 /*
@@ -77,35 +64,17 @@ 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)
+static ssize_t
+conn_read(sdb_conn_t *conn, size_t len)
 {
-	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);
+	return sdb_strbuf_read(conn->buf, conn->fd, len);
+} /* conn_read */
 
-	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 ssize_t
+conn_write(sdb_conn_t *conn, const void *buf, size_t len)
+{
+	return sdb_write(conn->fd, len, buf);
+} /* conn_write */
 
 static int
 connection_init(sdb_object_t *obj, va_list ap)
@@ -144,6 +113,16 @@ connection_init(sdb_object_t *obj, va_list ap)
 		return -1;
 	}
 
+	/* update the object name */
+	snprintf(obj->name + strlen(CONN_FD_PREFIX),
+			strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
+
+	/* defaults */
+	conn->read = conn_read;
+	conn->write = conn_write;
+	conn->finish = NULL;
+	conn->session = NULL;
+
 	if (conn->client_addr.ss_family != AF_UNIX) {
 		sdb_log(SDB_LOG_ERR, "frontend: Accepted connection using "
 				"unexpected family type %d", conn->client_addr.ss_family);
@@ -159,14 +138,7 @@ 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->username = NULL;
 	conn->ready = 0;
 
 	sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
@@ -175,10 +147,6 @@ connection_init(sdb_object_t *obj, va_list ap)
 	conn->cmd = SDB_CONNECTION_IDLE;
 	conn->cmd_len = 0;
 	conn->skip_len = 0;
-
-	/* update the object name */
-	snprintf(obj->name + strlen(CONN_FD_PREFIX),
-			strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
 	return 0;
 } /* connection_init */
 
@@ -193,6 +161,10 @@ connection_destroy(sdb_object_t *obj)
 
 	conn->ready = 0;
 
+	if (conn->finish)
+		conn->finish(conn);
+	conn->finish = NULL;
+
 	if (conn->buf) {
 		len = sdb_strbuf_len(conn->buf);
 		if (len)
@@ -325,6 +297,8 @@ command_handle(sdb_conn_t *conn)
 		status = sdb_fe_list(conn);
 	else if (conn->cmd == SDB_CONNECTION_LOOKUP)
 		status = sdb_fe_lookup(conn);
+	else if (conn->cmd == SDB_CONNECTION_STORE)
+		status = sdb_fe_store(conn);
 	else {
 		sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
 				conn->cmd);
@@ -356,7 +330,8 @@ command_init(sdb_conn_t *conn)
 	/* reset */
 	sdb_strbuf_clear(conn->errbuf);
 
-	if (sdb_proto_unmarshal_header(conn->buf, &conn->cmd, &conn->cmd_len))
+	if (sdb_proto_unmarshal_header(SDB_STRBUF_STR(conn->buf),
+				&conn->cmd, &conn->cmd_len) < 0)
 		return -1;
 	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
@@ -397,7 +372,7 @@ connection_read(sdb_conn_t *conn)
 		ssize_t status;
 
 		errno = 0;
-		status = sdb_strbuf_read(conn->buf, conn->fd, 1024);
+		status = conn->read(conn, 1024);
 		if (status < 0) {
 			if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
 				break;
@@ -455,6 +430,10 @@ sdb_connection_close(sdb_conn_t *conn)
 	if (! conn)
 		return;
 
+	if (conn->finish)
+		conn->finish(conn);
+	conn->finish = NULL;
+
 	/* close the connection even if someone else still references it */
 	if (conn->fd >= 0)
 		close(conn->fd);
@@ -507,7 +486,7 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 	if (sdb_proto_marshal(buf, sizeof(buf), code, msg_len, msg) < 0)
 		return -1;
 
-	status = sdb_write(conn->fd, sizeof(buf), buf);
+	status = conn->write(conn, buf, sizeof(buf));
 	if (status < 0) {
 		char errbuf[1024];