X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=f35f7b39c82a8278f47137e65810163094c33044;hp=e384bafa98297a7cf46c9283dee7b70a9c484dab;hb=ad77ec3d257ac66d74e91452d098882247abdc0a;hpb=49b5a4d2e8e4fb1e4f67c2a368d8d2e3e76b765f diff --git a/src/frontend/connection.c b/src/frontend/connection.c index e384baf..f35f7b3 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 #include @@ -42,6 +47,19 @@ #include #include +#include +#include +#include + +#ifdef HAVE_UCRED_H +# include +#endif +#ifdef HAVE_SYS_UCRED_H +# include +#endif + +#include + #include /* @@ -59,6 +77,48 @@ 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 ssize_t +conn_read(sdb_conn_t *conn, size_t len) +{ + return sdb_strbuf_read(conn->buf, conn->fd, len); +} /* conn_read */ + +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) { @@ -96,6 +156,12 @@ connection_init(sdb_object_t *obj, va_list ap) return -1; } + /* 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); @@ -111,6 +177,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); @@ -135,6 +211,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) @@ -143,9 +223,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); @@ -269,6 +347,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); @@ -300,9 +380,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)) @@ -342,13 +422,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 */ @@ -401,16 +480,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; @@ -441,25 +522,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 "