From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 6 Mar 2023 02:00:27 +0000 (+0100)
Subject: auth: sasl-server - Add sasl_server_request_set_authzid()
X-Git-Tag: 2.4.2~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02d28b51f185dfe29b69ad6bb250f1b035d653bd;p=thirdparty%2Fdovecot%2Fcore.git

auth: sasl-server - Add sasl_server_request_set_authzid()

Wraps auth_request_set_login_username().
---

diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c
index 5d8ead7a8c..a28a06dba4 100644
--- a/src/auth/sasl-server-mech-digest-md5.c
+++ b/src/auth/sasl-server-mech-digest-md5.c
@@ -576,9 +576,7 @@ mech_digest_md5_auth_continue(struct auth_request *auth_request,
 		return;
 	}
 	if (request->authzid != NULL &&
-	     !auth_request_set_login_username(auth_request, request->authzid,
-					      &error)) {
-		e_info(auth_request->mech_event, "login user: %s", error);
+	    !sasl_server_request_set_authzid(auth_request, request->authzid)) {
 		sasl_server_request_failure(auth_request);
 		return;
 	}
diff --git a/src/auth/sasl-server-mech-external.c b/src/auth/sasl-server-mech-external.c
index 119f1d58e8..9f8c4081ec 100644
--- a/src/auth/sasl-server-mech-external.c
+++ b/src/auth/sasl-server-mech-external.c
@@ -9,7 +9,7 @@ static void
 mech_external_auth_continue(struct auth_request *request,
 			    const unsigned char *data, size_t data_size)
 {
-	const char *authzid, *error;
+	const char *authzid;
 
 	authzid = t_strndup(data, data_size);
 
@@ -20,9 +20,7 @@ mech_external_auth_continue(struct auth_request *request,
 		return;
 	}
 	if (*authzid != '\0' &&
-	    !auth_request_set_login_username(request, authzid, &error)) {
-		e_info(request->mech_event,
-		       "login user: %s", error);
+	    !sasl_server_request_set_authzid(request, authzid)) {
 		sasl_server_request_failure(request);
 		return;
 	}
diff --git a/src/auth/sasl-server-mech-plain.c b/src/auth/sasl-server-mech-plain.c
index db5de3e065..78a410100d 100644
--- a/src/auth/sasl-server-mech-plain.c
+++ b/src/auth/sasl-server-mech-plain.c
@@ -10,7 +10,7 @@ static void
 mech_plain_auth_continue(struct auth_request *request,
 			 const unsigned char *data, size_t data_size)
 {
-	const char *authid, *authenid, *error;
+	const char *authid, *authenid;
 	char *pass;
 	size_t i, len;
 	int count;
@@ -49,10 +49,8 @@ mech_plain_auth_continue(struct auth_request *request,
 		/* invalid username */
 		sasl_server_request_failure(request);
 	} else if (*authid != '\0' &&
-		   !auth_request_set_login_username(request, authid, &error)) {
+		   !sasl_server_request_set_authzid(request, authid)) {
 		/* invalid login username */
-		e_info(request->mech_event,
-		       "login user: %s", error);
 		sasl_server_request_failure(request);
 	} else {
 		sasl_server_request_verify_plain(
diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index fa4485f7db..5ee54f6722 100644
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -80,13 +80,8 @@ mech_scram_set_login_username(struct auth_scram_server *asserver,
 	struct scram_auth_request *request =
 		container_of(asserver, struct scram_auth_request, scram_server);
 	struct auth_request *auth_request = &request->auth_request;
-	const char *error;
 
-	if (!auth_request_set_login_username(auth_request, username, &error)) {
-		e_info(auth_request->event, "%s", error);
-		return FALSE;
-	}
-	return TRUE;
+	return sasl_server_request_set_authzid(auth_request, username);
 }
 
 static void
diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 48112c3872..3deceeeb51 100644
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -70,6 +70,8 @@ void mech_oauth2_initialize(void);
 bool sasl_server_request_set_authid(struct auth_request *request,
 				    enum sasl_server_authid_type authid_type,
 				    const char *authid);
+bool sasl_server_request_set_authzid(struct auth_request *request,
+				     const char *authzid);
 
 void sasl_server_request_output(struct auth_request *request,
 				const void *data, size_t data_size);
diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index c06a5a8357..cc03ade8be 100644
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -16,6 +16,12 @@ bool sasl_server_request_set_authid(struct auth_request *request,
 	return auth_sasl_request_set_authid(request, authid_type, authid);
 }
 
+bool sasl_server_request_set_authzid(struct auth_request *request,
+				     const char *authzid)
+{
+	return auth_sasl_request_set_authzid(request, authzid);
+}
+
 void sasl_server_request_output(struct auth_request *request,
 				const void *data, size_t data_size)
 {