From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 11 Sep 2014 06:48:40 +0000 (+0200)
Subject: frontend: Guarantee that no async messages are sent before startup finished.
X-Git-Tag: sysdb-0.5.0~41
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=51069603a7b8d90e222508cbd67dcc5f231289ad;p=sysdb.git

frontend: Guarantee that no async messages are sent before startup finished.
---

diff --git a/src/frontend/connection-private.h b/src/frontend/connection-private.h
index ef445d3..a874751 100644
--- a/src/frontend/connection-private.h
+++ b/src/frontend/connection-private.h
@@ -73,6 +73,7 @@ struct sdb_conn {
 
 	/* user information */
 	char *username; /* NULL if the user has not been authenticated */
+	_Bool ready; /* indicates that startup finished successfully */
 };
 #define CONN(obj) ((sdb_conn_t *)(obj))
 
diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index ce16a8b..a741401 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -133,6 +133,8 @@ connection_destroy(sdb_object_t *obj)
 	assert(obj);
 	conn = CONN(obj);
 
+	conn->ready = 0;
+
 	if (conn->buf) {
 		len = sdb_strbuf_len(conn->buf);
 		if (len)
@@ -224,8 +226,8 @@ connection_log(int prio, const char *msg,
 
 	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 */
@@ -309,7 +311,7 @@ command_init(sdb_conn_t *conn)
 
 	sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
 
-	if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+	if ((! conn->ready) && (conn->cmd != CONNECTION_STARTUP))
 		errmsg = "Authentication required";
 	else if (conn->cmd == CONNECTION_IDLE)
 		errmsg = "Invalid command 0";
@@ -464,6 +466,7 @@ sdb_connection_send(sdb_conn_t *conn, uint32_t code,
 		 * 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,
diff --git a/src/frontend/session.c b/src/frontend/session.c
index 2b568b1..0587c50 100644
--- a/src/frontend/session.c
+++ b/src/frontend/session.c
@@ -63,6 +63,7 @@ sdb_fe_session_start(sdb_conn_t *conn)
 		return -1;
 	}
 	sdb_connection_send(conn, CONNECTION_OK, 0, NULL);
+	conn->ready = 1;
 	return 0;
 } /* sdb_fe_session_start */
 
diff --git a/src/include/frontend/proto.h b/src/include/frontend/proto.h
index 2e82738..1d549a9 100644
--- a/src/include/frontend/proto.h
+++ b/src/include/frontend/proto.h
@@ -96,7 +96,8 @@ typedef enum {
 	 * further requests to the client for authentication (not implemented
 	 * yet). Once the setup and authentication was successful, the server
 	 * replies with CONNECTION_OK. No other messages may be sent to the server
-	 * before this.
+	 * before this. Also, the server does not send any asynchronous messages
+	 * before startup is complete.
 	 */
 	CONNECTION_STARTUP,