FIX: Prevent calling sasl_server_step() before sasl_server_start()

memcached/memcached@ced9e17
naver · Nov 11, 2024 · 0b11d38 · 0b11d38
1 parent bf52896
commit 0b11d38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/memcached.c b/memcached.c
@@ -669,6 +669,7 @@ conn *conn_new(const int sfd, STATE_FUNC init_state,
     c->next = NULL;
     c->conn_prev = NULL;
     c->conn_next = NULL;
+    c->sasl_started = false;
     c->authenticated = false;
 
     c->write_and_go = init_state;
@@ -4267,8 +4268,17 @@ static void process_bin_complete_sasl_auth(conn *c)
     case PROTOCOL_BINARY_CMD_SASL_AUTH:
         result = sasl_server_start(c->sasl_conn, mech, challenge, vlen,
                                    &out, &outlen);
+        c->sasl_started = (result == SASL_OK || result == SASL_CONTINUE);
         break;
     case PROTOCOL_BINARY_CMD_SASL_STEP:
+        if (!c->sasl_started) {
+            if (settings.verbose) {
+                mc_logger->log(EXTENSION_LOG_WARNING, c,
+                               "%d: SASL_STEP called but sasl_server_start "
+                               "not called for this connection!\n", c->sfd);
+            }
+            break;
+        }
         result = sasl_server_step(c->sasl_conn, challenge, vlen,
                                   &out, &outlen);
         break;

diff --git a/memcached.h b/memcached.h
@@ -275,6 +275,7 @@ struct conn {
     int    sfd;
     short  nevents;
     sasl_conn_t *sasl_conn;
+    bool sasl_started;
     bool authenticated;
     STATE_FUNC   state;
     enum bin_substates substate;