From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Thu, 26 Oct 2023 15:39:15 +0000 (+0200)
Subject: login-common: sasl-server - Remove useless parsing of resp= field
X-Git-Tag: 2.4.0~2426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b2d11d33904bd60249dcd3ba0c2fd805ddd3b60;p=thirdparty%2Fdovecot%2Fcore.git

login-common: sasl-server - Remove useless parsing of resp= field

The auth-client already does that and provides it in the data_base64 parameter
---

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index 4655b34933..fc415befde 100644
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -338,7 +338,6 @@ authenticate_callback(struct auth_client_request *request,
 		      const char *const *args, void *context)
 {
 	struct client *client = context;
-	const char *sasl_final_delayed_resp;
 	unsigned int i;
 
 	if (!client->authenticating) {
@@ -368,7 +367,6 @@ authenticate_callback(struct auth_client_request *request,
 		client->auth_passdb_args = p_strarray_dup(client->pool, args);
 		client->postlogin_socket_path = NULL;
 
-		sasl_final_delayed_resp = NULL;
 		for (i = 0; args[i] != NULL; i++) {
 			const char *key, *value;
 			t_split_key_value_eq(args[i], &key, &value);
@@ -387,19 +385,16 @@ authenticate_callback(struct auth_client_request *request,
 				client->auth_anonymous = TRUE;
 			} else if (str_begins(args[i], "event_", &key)) {
 				event_add_str(client->event_auth, key, value);
-			} else if (strcmp(key, "resp") == 0) {
-				sasl_final_delayed_resp =
-					p_strdup(client->preproxy_pool, value);
 			}
 		}
 
-		if (sasl_final_delayed_resp != NULL &&
+		if (data_base64 != NULL &&
 		    !login_binary->sasl_support_final_reply) {
 			client->final_response = TRUE;
 			client->final_args = p_strarray_dup(client->preproxy_pool, args);
 			client->delayed_final_reply = SASL_SERVER_REPLY_SUCCESS;
 			client->sasl_callback(client, SASL_SERVER_REPLY_CONTINUE,
-					      sasl_final_delayed_resp, NULL);
+					      data_base64, NULL);
 		} else {
 			sasl_server_auth_success_finish(client, args);
 		}
@@ -411,7 +406,6 @@ authenticate_callback(struct auth_client_request *request,
 	case AUTH_REQUEST_STATUS_ABORT:
 		client->auth_request = NULL;
 
-		sasl_final_delayed_resp = NULL;
 		if (args != NULL) {
 			/* parse our username if it's there */
 			for (i = 0; args[i] != NULL; i++) {
@@ -419,20 +413,16 @@ authenticate_callback(struct auth_client_request *request,
 				t_split_key_value_eq(args[i], &key, &value);
 				if (args_parse_user(client, key, value))
 					continue;
-				if (strcmp(key, "resp") == 0) {
-					sasl_final_delayed_resp =
-						p_strdup(client->preproxy_pool, value);
-				}
 			}
 		}
 
-		if (sasl_final_delayed_resp != NULL &&
+		if (data_base64 != NULL &&
 		    !login_binary->sasl_support_final_reply) {
 			client->final_response = TRUE;
 			client->final_args = p_strarray_dup(client->preproxy_pool, args);
 			client->delayed_final_reply = SASL_SERVER_REPLY_AUTH_FAILED;
 			client->sasl_callback(client, SASL_SERVER_REPLY_CONTINUE,
-					      sasl_final_delayed_resp, NULL);
+					      data_base64, NULL);
 		} else {
 			client->authenticating = FALSE;
 			call_client_callback(client, SASL_SERVER_REPLY_AUTH_FAILED,