frontend: Treat CONNECTION_IDLE as an invalid command.

[sysdb.git] / src / frontend / connection.c

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index 69c71edbd3e6f7ac9e5876841d9237f738267ab5..923f000743db5f3694698ffbecdb9a0a033ec4b4 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -140,12 +140,15 @@ connection_destroy(sdb_object_t *obj)
                                        "(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
        }
 
-       sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i",
-                       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);
@@ -185,7 +188,13 @@ sdb_conn_ctx_init(void)
 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);
@@ -256,14 +265,12 @@ command_handle(sdb_conn_t *conn)
 
        if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
                const char *errmsg = "Authentication required";
+               sdb_strbuf_sprintf(conn->errbuf, errmsg);
                sdb_connection_send(conn, CONNECTION_ERROR,
                                (uint32_t)strlen(errmsg), errmsg);
                return -1;
        }
 
-       /* reset */
-       sdb_strbuf_sprintf(conn->errbuf, "");
-
        switch (conn->cmd) {
                case CONNECTION_PING:
                        status = sdb_connection_ping(conn);
@@ -350,12 +357,6 @@ command_handle(sdb_conn_t *conn)
                sdb_connection_send(conn, CONNECTION_ERROR,
                                (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 */
 
@@ -367,12 +368,21 @@ command_init(sdb_conn_t *conn)
 
        assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
 
+       /* reset */
+       sdb_strbuf_sprintf(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)
+       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);
                len += conn->cmd_len;
+               conn->cmd_len = 0;
+       }
        sdb_strbuf_skip(conn->buf, 0, len);
        return 0;
 } /* command_init */
@@ -434,6 +444,14 @@ 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 */
 
@@ -451,9 +469,16 @@ sdb_connection_read(sdb_conn_t *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;