X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=807bd074aa295108a5445cc6d3d82d760a996df2;hb=ba8c9777ab4b31f8534108e8db30c26d61458d11;hp=f35f7b39c82a8278f47137e65810163094c33044;hpb=ad77ec3d257ac66d74e91452d098882247abdc0a;p=sysdb.git diff --git a/src/frontend/connection.c b/src/frontend/connection.c index f35f7b3..807bd07 100644 --- a/src/frontend/connection.c +++ b/src/frontend/connection.c @@ -44,23 +44,14 @@ #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 +#include /* * private variables @@ -77,36 +68,6 @@ 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) { @@ -156,17 +117,15 @@ 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); - return -1; - } + conn->ssl_session = NULL; sock_fl = fcntl(conn->fd, F_GETFL); if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) { @@ -177,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", @@ -193,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 */ @@ -222,7 +170,18 @@ connection_destroy(sdb_object_t *obj) "(%zu byte%s left in buffer)", len, len == 1 ? "" : "s"); } - sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name); + if (conn->client_addr.ss_family == AF_UNIX) { + sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s from peer %s", + obj->name, conn->username); + } + 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_DEBUG, "frontend: Closing connection %s from peer %s " + "at %s:%s", obj->name, conn->username, host, port); + } sdb_connection_close(conn); if (conn->username) @@ -332,23 +291,25 @@ 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) - status = sdb_fe_session_start(conn); + status = sdb_conn_session_start(conn); + else if (conn->cmd == SDB_CONNECTION_QUERY) - status = sdb_fe_query(conn); + status = sdb_conn_query(conn); else if (conn->cmd == SDB_CONNECTION_FETCH) - status = sdb_fe_fetch(conn); + status = sdb_conn_fetch(conn); else if (conn->cmd == SDB_CONNECTION_LIST) - status = sdb_fe_list(conn); + status = sdb_conn_list(conn); else if (conn->cmd == SDB_CONNECTION_LOOKUP) - status = sdb_fe_lookup(conn); + status = sdb_conn_lookup(conn); else if (conn->cmd == SDB_CONNECTION_STORE) - status = sdb_fe_store(conn); + status = sdb_conn_store(conn); + + else if (conn->cmd == SDB_CONNECTION_SERVER_VERSION) + status = sdb_connection_server_version(conn); + else { sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x", conn->cmd); @@ -463,15 +424,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 @@ -563,5 +548,20 @@ sdb_connection_ping(sdb_conn_t *conn) return 0; } /* sdb_connection_ping */ +int +sdb_connection_server_version(sdb_conn_t *conn) +{ + char msg[sizeof(uint32_t) + strlen(SDB_VERSION_EXTRA) + 1]; + + if ((! conn) || (conn->cmd != SDB_CONNECTION_SERVER_VERSION)) + return -1; + + sdb_proto_marshal_int32(msg, sizeof(msg), (uint32_t)SDB_VERSION); + strncpy(msg + sizeof(uint32_t), SDB_VERSION_EXTRA, + sizeof(msg) - sizeof(uint32_t)); + sdb_connection_send(conn, SDB_CONNECTION_OK, (uint32_t)sizeof(msg), msg); + return 0; +} /* sdb_connection_server_version */ + /* vim: set tw=78 sw=4 ts=4 noexpandtab : */