index f780979cac6ed333104d26f15bf2c8829184fb24..ebc3b99332d92d0e929f51467edbc549f0088630 100644 (file)
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "sysdb.h"
#include "core/object.h"
#include "sysdb.h"
#include "core/object.h"
+#include "core/plugin.h"
#include "frontend/connection-private.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
#include "frontend/connection-private.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
+#include "utils/os.h"
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
#include <arpa/inet.h>
#include <fcntl.h>
#include <arpa/inet.h>
#include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <stdlib.h>
#include <string.h>
#include <string.h>
+#include <pthread.h>
+#include <netdb.h>
+
+/*
+ * private variables
+ */
+
+static pthread_key_t conn_ctx_key;
+static bool conn_ctx_key_initialized = 0;
+
/*
/*
- * private data types
+ * private types
*/
/* name of connection objects */
#define CONN_FD_PREFIX "conn#"
#define CONN_FD_PLACEHOLDER "XXXXXXX"
*/
/* name of connection objects */
#define CONN_FD_PREFIX "conn#"
#define CONN_FD_PLACEHOLDER "XXXXXXX"
+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)
{
static int
connection_init(sdb_object_t *obj, va_list ap)
{
return -1;
}
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->ssl_session = NULL;
sock_fl = fcntl(conn->fd, F_GETFL);
if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
sock_fl = fcntl(conn->fd, F_GETFL);
if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
return -1;
}
return -1;
}
+ conn->username = NULL;
+ conn->ready = 0;
+
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
conn->fd);
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
conn->fd);
- conn->cmd = CONNECTION_IDLE;
+ conn->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
conn->cmd_len = 0;
-
- /* update the object name */
- snprintf(obj->name + strlen(CONN_FD_PREFIX),
- strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
+ conn->skip_len = 0;
return 0;
} /* connection_init */
return 0;
} /* connection_init */
assert(obj);
conn = CONN(obj);
assert(obj);
conn = CONN(obj);
+ conn->ready = 0;
+
+ if (conn->finish)
+ conn->finish(conn);
+ conn->finish = NULL;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
- sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i",
- conn->fd);
- close(conn->fd);
- conn->fd = -1;
+ 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] = "<unknown>", 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)
+ free(conn->username);
+ conn->username = NULL;
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
};
/*
};
/*
- * connection handler functions
+ * private helper functions
*/
*/
-static uint32_t
-connection_get_int32(sdb_conn_t *conn, size_t offset)
+static void
+sdb_conn_ctx_destructor(void *c)
{
{
- const char *data;
- uint32_t n;
+ sdb_object_t *conn = c;
- assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t)));
+ if (! conn)
+ return;
+ sdb_object_deref(conn);
+} /* sdb_conn_ctx_destructor */
- data = sdb_strbuf_string(conn->buf);
- memcpy(&n, data + offset, sizeof(n));
- n = ntohl(n);
- return n;
-} /* connection_get_int32 */
+static void
+sdb_conn_ctx_init(void)
+{
+ if (conn_ctx_key_initialized)
+ return;
+
+ pthread_key_create(&conn_ctx_key, sdb_conn_ctx_destructor);
+ conn_ctx_key_initialized = 1;
+} /* sdb_conn_ctx_init */
+
+static void
+sdb_conn_set_ctx(sdb_conn_t *conn)
+{
+ sdb_conn_t *old;
+
+ sdb_conn_ctx_init();
+
+ old = pthread_getspecific(conn_ctx_key);
+ if (old)
+ sdb_object_deref(SDB_OBJ(old));
+ if (conn)
+ sdb_object_ref(SDB_OBJ(conn));
+ pthread_setspecific(conn_ctx_key, conn);
+} /* sdb_conn_set_ctx */
+
+static sdb_conn_t *
+sdb_conn_get_ctx(void)
+{
+ if (! conn_ctx_key_initialized)
+ return NULL;
+ return pthread_getspecific(conn_ctx_key);
+} /* sdb_conn_get_ctx */
+/*
+ * connection handler functions
+ */
+
+/*
+ * connection_log:
+ * Send a log message originating from the current thread to the client.
+ */
static int
static int
-command_handle(sdb_conn_t *conn)
+connection_log(int prio, const char *msg,
+ sdb_object_t __attribute__((unused)) *user_data)
{
{
- int status = -1;
+ uint32_t len = (uint32_t)sizeof(uint32_t) + (uint32_t)strlen(msg);
+ uint32_t p = htonl((uint32_t)prio);
+ char tmp[len + 1];
- assert(conn && (conn->cmd != CONNECTION_IDLE));
+ sdb_conn_t *conn;
- sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
- conn->cmd, conn->cmd_len);
+ conn = sdb_conn_get_ctx();
+ /* no connection associated to this thread
+ * or startup not done yet => don't leak any information */
+ if ((! conn) || (! conn->ready))
+ return 0;
- /* reset */
- sdb_strbuf_sprintf(conn->errbuf, "");
+ /* XXX: make the log-level configurable by the client at runtime */
+ if (prio >= SDB_LOG_DEBUG)
+ return 0;
- switch (conn->cmd) {
- case CONNECTION_PING:
- status = sdb_connection_ping(conn);
- break;
- case CONNECTION_STARTUP:
- status = sdb_fe_session_start(conn);
- break;
+ memcpy(tmp, &p, sizeof(p));
+ strcpy(tmp + sizeof(p), msg);
- case CONNECTION_QUERY:
- {
- sdb_llist_t *parsetree;
- sdb_conn_node_t *node = NULL;
-
- parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
- (int)conn->cmd_len);
- if (! parsetree) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
- sdb_strbuf_string(conn->buf));
- status = -1;
- break;
- }
-
- switch (sdb_llist_len(parsetree)) {
- case 0:
- /* skipping empty command */
- break;
- case 1:
- node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
- break;
-
- default:
- sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %d command%s "
- "in multi-statement query '%s'",
- sdb_llist_len(parsetree) - 1,
- sdb_llist_len(parsetree) == 2 ? "" : "s",
- sdb_strbuf_string(conn->buf));
- node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
- }
-
- if (node)
- status = sdb_fe_exec(conn, node);
-
- sdb_llist_destroy(parsetree);
- break;
- }
+ if (sdb_connection_send(conn, SDB_CONNECTION_LOG, len, tmp) < 0)
+ return -1;
+ return 0;
+} /* connection_log */
- case CONNECTION_LIST:
- status = sdb_fe_list(conn);
- break;
+static int
+command_handle(sdb_conn_t *conn)
+{
+ int status = -1;
- default:
- {
- sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
- conn->cmd);
- sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
- status = -1;
- break;
- }
+ assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
+ assert(! conn->skip_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);
+
+ else if (conn->cmd == SDB_CONNECTION_QUERY)
+ status = sdb_fe_query(conn);
+ else if (conn->cmd == SDB_CONNECTION_FETCH)
+ status = sdb_fe_fetch(conn);
+ else if (conn->cmd == SDB_CONNECTION_LIST)
+ 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 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);
+ sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
+ status = -1;
}
}
- if (status)
- sdb_connection_send(conn, CONNECTION_ERROR,
+ if (status) {
+ if (! sdb_strbuf_len(conn->errbuf))
+ sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
+ sdb_connection_send(conn, SDB_CONNECTION_ERROR,
(uint32_t)sdb_strbuf_len(conn->errbuf),
sdb_strbuf_string(conn->errbuf));
(uint32_t)sdb_strbuf_len(conn->errbuf),
sdb_strbuf_string(conn->errbuf));
-
- /* remove the command from the buffer */
- if (conn->cmd_len)
- sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
- conn->cmd = CONNECTION_IDLE;
- conn->cmd_len = 0;
+ }
return status;
} /* command_handle */
return status;
} /* command_handle */
static int
command_init(sdb_conn_t *conn)
{
static int
command_init(sdb_conn_t *conn)
{
- size_t len;
+ const char *errmsg = NULL;
- assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+ assert(conn && (conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len));
- conn->cmd = connection_get_int32(conn, 0);
- conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
+ if (conn->skip_len)
+ return -1;
- len = 2 * sizeof(uint32_t);
- if (conn->cmd == CONNECTION_IDLE)
- len += conn->cmd_len;
- sdb_strbuf_skip(conn->buf, 0, len);
+ /* reset */
+ sdb_strbuf_clear(conn->errbuf);
+
+ 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))
+ errmsg = "Authentication required";
+ else if (conn->cmd == SDB_CONNECTION_IDLE)
+ errmsg = "Invalid command 0";
+
+ if (errmsg) {
+ size_t len = sdb_strbuf_len(conn->buf);
+
+ sdb_strbuf_sprintf(conn->errbuf, "%s", errmsg);
+ sdb_connection_send(conn, SDB_CONNECTION_ERROR,
+ (uint32_t)strlen(errmsg), errmsg);
+ conn->skip_len += conn->cmd_len;
+ conn->cmd = SDB_CONNECTION_IDLE;
+ conn->cmd_len = 0;
+
+ if (len > conn->skip_len)
+ len = conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ /* connection_read will handle anything else */
+ }
return 0;
} /* command_init */
return 0;
} /* command_init */
{
ssize_t n = 0;
{
ssize_t n = 0;
+ if ((! conn) || (conn->fd < 0))
+ return -1;
+
while (42) {
ssize_t status;
errno = 0;
while (42) {
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;
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
+
+ sdb_connection_close(conn);
return (int)status;
}
else if (! status) /* EOF */
break;
return (int)status;
}
else if (! status) /* EOF */
break;
+ if (conn->skip_len) {
+ size_t len = (size_t)status < conn->skip_len
+ ? (size_t)status : conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ }
+
n += status;
n += status;
+
+ /* give the main loop a chance to execute commands (and free up buffer
+ * space) on large amounts of incoming traffic */
+ if (n > 1024 * 1024)
+ break;
}
return n;
}
return n;
* public API
*/
* public API
*/
+int
+sdb_connection_enable_logging(void)
+{
+ return sdb_plugin_register_log("connection-logger", connection_log,
+ /* user_data = */ NULL);
+} /* sdb_connection_enable_logging */
+
sdb_conn_t *
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 */
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));
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] = "<unknown>", 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
sdb_connection_close(sdb_conn_t *conn)
{
} /* sdb_connection_create */
void
sdb_connection_close(sdb_conn_t *conn)
{
- sdb_object_deref(SDB_OBJ(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_connection_close */
ssize_t
} /* sdb_connection_close */
ssize_t
-sdb_connection_read(sdb_conn_t *conn)
+sdb_connection_handle(sdb_conn_t *conn)
{
ssize_t n = 0;
{
ssize_t n = 0;
+ sdb_conn_set_ctx(conn);
+
while (42) {
ssize_t status = connection_read(conn);
while (42) {
ssize_t status = connection_read(conn);
- if ((conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len)
+ if ((conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len)
&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
command_init(conn);
&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
command_init(conn);
- if ((conn->cmd != CONNECTION_IDLE)
- && (sdb_strbuf_len(conn->buf) >= conn->cmd_len))
+ if ((conn->cmd != SDB_CONNECTION_IDLE)
+ && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
command_handle(conn);
command_handle(conn);
+ /* remove the command from the buffer */
+ if (conn->cmd_len)
+ sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
+ conn->cmd = SDB_CONNECTION_IDLE;
+ conn->cmd_len = 0;
+ }
+
if (status <= 0)
break;
n += status;
}
if (status <= 0)
break;
n += status;
}
+
+ sdb_conn_set_ctx(NULL);
return n;
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)
{
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;
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];
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 */
+ sdb_connection_close(conn);
+ conn->ready = 0;
+
sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
"(code: %u, len: %u) to client: %s", code, msg_len,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
"(code: %u, len: %u) to client: %s", code, msg_len,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
int
sdb_connection_ping(sdb_conn_t *conn)
{
int
sdb_connection_ping(sdb_conn_t *conn)
{
- if ((! conn) || (conn->cmd != CONNECTION_PING))
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_PING))
return -1;
/* we're alive */
return -1;
/* we're alive */
- sdb_connection_send(conn, CONNECTION_OK, 0, NULL);
+ sdb_connection_send(conn, SDB_CONNECTION_OK, 0, NULL);
return 0;
} /* sdb_connection_ping */
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 : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */