![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 04d12222c89838e8b9ed2a126e3a778773a912bf..ce16a8b900085ecbac3eb5ef82b4af466400dcca 100644 (file)
*/
#include "sysdb.h"
-#include "core/error.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 <assert.h>
#include <errno.h>
#include <arpa/inet.h>
#include <fcntl.h>
+#include <stdlib.h>
#include <string.h>
+#include <pthread.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 */
"for a new connection");
return -1;
}
+ conn->errbuf = sdb_strbuf_create(0);
+ if (! conn->errbuf) {
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate an error buffer "
+ "for a new connection");
+ return -1;
+ }
conn->client_addr_len = sizeof(conn->client_addr);
conn->fd = accept(sock_fd, (struct sockaddr *)&conn->client_addr,
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
+ conn->skip_len = 0;
/* update the object name */
snprintf(obj->name + strlen(CONN_FD_PREFIX),
"(%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);
+ sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
+ if (conn->fd >= 0)
+ close(conn->fd);
conn->fd = -1;
+ if (conn->username)
+ free(conn->username);
+ conn->username = NULL;
+
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
+ sdb_strbuf_destroy(conn->errbuf);
+ conn->errbuf = NULL;
} /* connection_destroy */
static sdb_type_t connection_type = {
/* destroy = */ connection_destroy,
};
+/*
+ * private helper functions
+ */
+
+static void
+sdb_conn_ctx_destructor(void *c)
+{
+ sdb_object_t *conn = c;
+
+ if (! conn)
+ return;
+ sdb_object_deref(conn);
+} /* sdb_conn_ctx_destructor */
+
+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
+connection_log(int prio, const char *msg,
+ sdb_object_t __attribute__((unused)) *user_data)
+{
+ sdb_conn_t *conn;
+
+ conn = sdb_conn_get_ctx();
+ /* no connection associated to this thread
+ * or user not authenticated yet => don't leak any information */
+ if ((! conn) || (! conn->username))
+ return 0;
+
+ /* XXX: make the log-level configurable by the client at runtime */
+ if (prio >= SDB_LOG_DEBUG)
+ return 0;
+
+ /* TODO: Use CONNECTION_LOG_<prio>? */
+ if (sdb_connection_send(conn, CONNECTION_LOG,
+ (uint32_t)strlen(msg), msg) < 0)
+ return -1;
+ return 0;
+} /* connection_log */
+
static uint32_t
connection_get_int32(sdb_conn_t *conn, size_t offset)
{
int status = -1;
assert(conn && (conn->cmd != CONNECTION_IDLE));
+ assert(! conn->skip_len);
sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
conn->cmd, conn->cmd_len);
- switch (conn->cmd) {
- case CONNECTION_PING:
- status = sdb_connection_ping(conn);
- break;
- case CONNECTION_STARTUP:
- status = sdb_session_start(conn);
- break;
-
- case CONNECTION_LIST:
- status = sdb_fe_list(conn);
- break;
-
- default:
- {
- char errbuf[1024];
- sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command");
- snprintf(errbuf, sizeof(errbuf), "Invalid command %#x", conn->cmd);
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)(strlen(errbuf) + 1), errbuf);
- status = -1;
- break;
- }
+ if (conn->cmd == CONNECTION_PING)
+ status = sdb_connection_ping(conn);
+ else if (conn->cmd == CONNECTION_STARTUP)
+ status = sdb_fe_session_start(conn);
+ else if (conn->cmd == CONNECTION_QUERY)
+ status = sdb_fe_query(conn);
+ else if (conn->cmd == CONNECTION_FETCH)
+ status = sdb_fe_fetch(conn);
+ else if (conn->cmd == CONNECTION_LIST)
+ status = sdb_fe_list(conn);
+ else if (conn->cmd == CONNECTION_LOOKUP)
+ status = sdb_fe_lookup(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;
}
- /* remove the command from the buffer */
- if (conn->cmd_len)
- sdb_strbuf_skip(conn->buf, conn->cmd_len);
- conn->cmd = CONNECTION_IDLE;
- conn->cmd_len = 0;
+ if (status)
+ sdb_connection_send(conn, CONNECTION_ERROR,
+ (uint32_t)sdb_strbuf_len(conn->errbuf),
+ sdb_strbuf_string(conn->errbuf));
return status;
} /* command_handle */
static int
command_init(sdb_conn_t *conn)
{
- size_t len;
+ const char *errmsg = NULL;
assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+ if (conn->skip_len)
+ return -1;
+
+ /* reset */
+ sdb_strbuf_clear(conn->errbuf);
+
conn->cmd = connection_get_int32(conn, 0);
conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
- len = 2 * sizeof(uint32_t);
- if (conn->cmd == CONNECTION_IDLE)
- len += conn->cmd_len;
- sdb_strbuf_skip(conn->buf, len);
+ sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+ if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+ errmsg = "Authentication required";
+ else if (conn->cmd == 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, CONNECTION_ERROR,
+ (uint32_t)strlen(errmsg), errmsg);
+ conn->skip_len += conn->cmd_len;
+ conn->cmd = 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 */
{
ssize_t n = 0;
+ if ((! conn) || (conn->fd < 0))
+ return -1;
+
while (42) {
ssize_t status;
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
+
+ close(conn->fd);
+ conn->fd = -1;
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;
+
+ /* 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;
* 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_connection_accept(int fd)
{
void
sdb_connection_close(sdb_conn_t *conn)
{
+ if (! conn)
+ return;
+
+ /* 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 n = 0;
+ sdb_conn_set_ctx(conn);
+
while (42) {
ssize_t status = connection_read(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))
+ && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
command_handle(conn);
+ /* 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;
+ }
+
if (status <= 0)
break;
n += status;
}
+
+ sdb_conn_set_ctx(NULL);
return n;
} /* sdb_connection_read */
sdb_connection_send(sdb_conn_t *conn, uint32_t code,
uint32_t msg_len, const char *msg)
{
- size_t len = 2 * sizeof(uint32_t) + msg_len;
- char buffer[len];
- char *buf;
-
- uint32_t tmp;
+ ssize_t status;
if ((! conn) || (conn->fd < 0))
return -1;
- tmp = htonl(code);
- memcpy(buffer, &tmp, sizeof(uint32_t));
+ status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+ if (status < 0) {
+ char errbuf[1024];
- tmp = htonl(msg_len);
- memcpy(buffer + sizeof(uint32_t), &tmp, sizeof(uint32_t));
+ /* 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;
- if (msg_len)
- memcpy(buffer + 2 * sizeof(uint32_t), msg, msg_len);
-
- buf = buffer;
- while (len > 0) {
- ssize_t status;
-
- /* XXX: use select() */
-
- errno = 0;
- status = write(conn->fd, buf, len);
- if (status < 0) {
- char errbuf[1024];
-
- if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- continue;
- if (errno == EINTR)
- continue;
-
- 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)));
- return status;
- }
-
- len -= (size_t)status;
- buf += status;
+ 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)));
}
- return (ssize_t)len;
+ return status;
} /* sdb_connection_send */
int