![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index dba431049ac8af878f2c6df85779d57012531218..bb0f494f2d432c849e4c60be174b3cfec3f786ab 100644 (file)
#include "core/object.h"
#include "core/plugin.h"
#include "frontend/connection-private.h"
-#include "frontend/parser.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
assert(obj);
conn = CONN(obj);
+ conn->ready = 0;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
connection_log(int prio, const char *msg,
sdb_object_t __attribute__((unused)) *user_data)
{
+ uint32_t len = (uint32_t)sizeof(uint32_t) + (uint32_t)strlen(msg);
+ uint32_t p = htonl((uint32_t)prio);
+ char tmp[len + 1];
+
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))
+ * or startup not done yet => don't leak any information */
+ if ((! conn) || (! conn->ready))
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)
+ memcpy(tmp, &p, sizeof(p));
+ strcpy(tmp + sizeof(p), msg);
+
+ if (sdb_connection_send(conn, CONNECTION_LOG, len, tmp) < 0)
return -1;
return 0;
} /* connection_log */
-static uint32_t
-connection_get_int32(sdb_conn_t *conn, size_t offset)
-{
- const char *data;
- uint32_t n;
-
- assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t)));
-
- data = sdb_strbuf_string(conn->buf);
- memcpy(&n, data + offset, sizeof(n));
- n = ntohl(n);
- return n;
-} /* connection_get_int32 */
-
static int
command_handle(sdb_conn_t *conn)
{
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_fe_session_start(conn);
- break;
-
- 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_object_deref(SDB_OBJ(node));
- }
-
- sdb_llist_destroy(parsetree);
- break;
- }
-
- case CONNECTION_FETCH:
- status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
- break;
- case CONNECTION_LIST:
- status = sdb_fe_list(conn);
- break;
- case CONNECTION_LOOKUP:
- {
- sdb_store_matcher_t *m;
-
- m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
- (int)conn->cmd_len);
- if (! m) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to parse expression '%s'",
- sdb_strbuf_string(conn->buf));
- status = -1;
- break;
- }
-
- status = sdb_fe_lookup(conn, m);
- sdb_object_deref(SDB_OBJ(m));
- break;
- }
-
- 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;
- }
+ 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;
}
- if (status)
+ if (status) {
+ if (! sdb_strbuf_len(conn->errbuf))
+ sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
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));
return -1;
/* reset */
- sdb_strbuf_sprintf(conn->errbuf, "");
+ 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));
+
+ sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+ if ((! conn->ready) && (conn->cmd != CONNECTION_STARTUP))
+ errmsg = "Authentication required";
+ else if (conn->cmd == CONNECTION_IDLE)
+ errmsg = "Invalid command 0";
- conn->cmd = connection_get_int32(conn, 0);
- conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
+ if (errmsg) {
+ size_t len = sdb_strbuf_len(conn->buf);
- if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
- const char *errmsg = "Authentication required";
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
+ 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;
- }
- else if (conn->cmd == CONNECTION_IDLE) {
- const char *errmsg = "Invalid command 0";
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)strlen(errmsg), errmsg);
- conn->skip_len += conn->cmd_len;
- conn->cmd_len = 0;
- }
- sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
- if (conn->skip_len) {
- len = sdb_strbuf_len(conn->buf);
if (len > conn->skip_len)
len = conn->skip_len;
sdb_strbuf_skip(conn->buf, 0, 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;
* make sure we don't try to send further logs to the connection */
close(conn->fd);
conn->fd = -1;
+ conn->ready = 0;
sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
"(code: %u, len: %u) to client: %s", code, msg_len,