X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=44247ebd4961988035b7c90c70baf12e377b8c0b;hp=b27b3dd28bfbfd0324941d1861bc2bdd5d60a8ca;hb=23b12088ee320df7b54f5c81011daf8995e22203;hpb=13fe0f9ec3d161fab7a015054649910541d75f5e diff --git a/src/frontend/connection.c b/src/frontend/connection.c index b27b3dd..44247eb 100644 --- a/src/frontend/connection.c +++ b/src/frontend/connection.c @@ -36,6 +36,7 @@ #include "utils/error.h" #include "utils/strbuf.h" #include "utils/proto.h" +#include "utils/os.h" #include #include @@ -43,23 +44,14 @@ #include #include -#include -#include - #include -#include -#include +#include -#ifdef HAVE_UCRED_H -# include -#endif -#ifdef HAVE_SYS_UCRED_H -# include -#endif - -#include +#include +#include #include +#include /* * private variables @@ -76,35 +68,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); - - 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 + return sdb_strbuf_read(conn->buf, conn->fd, len); +} /* conn_read */ - 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) @@ -143,11 +117,15 @@ connection_init(sdb_object_t *obj, va_list ap) return -1; } - 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); - 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; sock_fl = fcntl(conn->fd, F_GETFL); if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) { @@ -158,14 +136,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", @@ -174,10 +145,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 */ @@ -192,6 +159,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) @@ -200,9 +171,7 @@ connection_destroy(sdb_object_t *obj) } sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name); - if (conn->fd >= 0) - close(conn->fd); - conn->fd = -1; + sdb_connection_close(conn); if (conn->username) free(conn->username); @@ -311,9 +280,6 @@ command_handle(sdb_conn_t *conn) assert(conn && (conn->cmd != SDB_CONNECTION_IDLE)); assert(! conn->skip_len); - sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)", - conn->cmd, conn->cmd_len); - if (conn->cmd == SDB_CONNECTION_PING) status = sdb_connection_ping(conn); else if (conn->cmd == SDB_CONNECTION_STARTUP) @@ -326,6 +292,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); @@ -357,9 +325,9 @@ command_init(sdb_conn_t *conn) /* reset */ sdb_strbuf_clear(conn->errbuf); - conn->cmd = sdb_proto_get_int(conn->buf, 0); - conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t)); - + 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)); if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP)) @@ -399,13 +367,12 @@ 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; - close(conn->fd); - conn->fd = -1; + sdb_connection_close(conn); return (int)status; } else if (! status) /* EOF */ @@ -441,15 +408,39 @@ sdb_connection_enable_logging(void) } /* sdb_connection_enable_logging */ sdb_conn_t * -sdb_connection_accept(int fd) +sdb_connection_accept(int fd, sdb_conn_setup_cb setup, void *user_data) { + sdb_conn_t *conn; + const char *peer = "unknown"; + if (fd < 0) return NULL; /* the placeholder will be replaced with the accepted file * descriptor when initializing the object */ - return CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER, + conn = CONN(sdb_object_create(CONN_FD_PREFIX CONN_FD_PLACEHOLDER, connection_type, fd)); + if (setup && (setup(conn, user_data) < 0)) { + sdb_object_deref(SDB_OBJ(conn)); + return NULL; + } + + if (conn->username) + peer = conn->username; + + if (conn->client_addr.ss_family == AF_UNIX) { + sdb_log(SDB_LOG_INFO, + "frontend: Accepted connection from peer %s", peer); + } + else { + char host[1024] = "", port[32] = ""; + getnameinfo((struct sockaddr *)&conn->client_addr, + conn->client_addr_len, host, sizeof(host), port, sizeof(port), + NI_NUMERICHOST | NI_NUMERICSERV); + sdb_log(SDB_LOG_INFO, "frontend: Accepted connection from " + "peer %s at %s:%s", peer, host, port); + } + return conn; } /* sdb_connection_create */ void @@ -458,16 +449,18 @@ 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); 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; @@ -498,25 +491,27 @@ 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 = conn->write(conn, buf, sizeof(buf)); if (status < 0) { char errbuf[1024]; /* tell other code that there was a problem and, more importantly, * make sure we don't try to send further logs to the connection */ - close(conn->fd); - conn->fd = -1; + sdb_connection_close(conn); conn->ready = 0; sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "