From: Stephan Bosch Date: Sat, 4 Mar 2023 02:25:38 +0000 (+0100) Subject: auth: sasl-server - Add sasl_server_request_success() X-Git-Tag: 2.4.2~274 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f1f9f039093e49fa29f29f32b1c2c839db585b;p=thirdparty%2Fdovecot%2Fcore.git auth: sasl-server - Add sasl_server_request_success() Wraps auth_request_success(). --- diff --git a/src/auth/auth-sasl-mech-apop.c b/src/auth/auth-sasl-mech-apop.c index ad74b90582..c1dc95febc 100644 --- a/src/auth/auth-sasl-mech-apop.c +++ b/src/auth/auth-sasl-mech-apop.c @@ -53,7 +53,7 @@ apop_credentials_callback(enum passdb_result result, switch (result) { case PASSDB_RESULT_OK: if (verify_credentials(request, credentials, size)) - auth_request_success(auth_request, "", 0); + sasl_server_request_success(auth_request, "", 0); else auth_request_fail(auth_request); break; diff --git a/src/auth/auth-sasl-mech-dovecot-token.c b/src/auth/auth-sasl-mech-dovecot-token.c index 2614921f38..358200d882 100644 --- a/src/auth/auth-sasl-mech-dovecot-token.c +++ b/src/auth/auth-sasl-mech-dovecot-token.c @@ -57,7 +57,7 @@ mech_dovecot_token_auth_continue(struct auth_request *request, str_equals_timing_almost_safe(auth_token, valid_token)) { request->passdb_success = TRUE; auth_request_set_field(request, "userdb_client_service", service, ""); - auth_request_success(request, NULL, 0); + sasl_server_request_success(request, NULL, 0); } else { auth_request_fail(request); } diff --git a/src/auth/sasl-server-mech-anonymous.c b/src/auth/sasl-server-mech-anonymous.c index e49ac3f237..87ee07e3f7 100644 --- a/src/auth/sasl-server-mech-anonymous.c +++ b/src/auth/sasl-server-mech-anonymous.c @@ -18,7 +18,7 @@ mech_anonymous_auth_continue(struct auth_request *request, request->set->anonymous_username); request->passdb_success = TRUE; - auth_request_success(request, "", 0); + sasl_server_request_success(request, "", 0); } static struct auth_request *mech_anonymous_auth_new(void) diff --git a/src/auth/sasl-server-mech-cram-md5.c b/src/auth/sasl-server-mech-cram-md5.c index 49682fa763..2d40123fca 100644 --- a/src/auth/sasl-server-mech-cram-md5.c +++ b/src/auth/sasl-server-mech-cram-md5.c @@ -76,7 +76,7 @@ verify_credentials(struct auth_request *auth_request, return; } - auth_request_success(auth_request, "", 0); + sasl_server_request_success(auth_request, "", 0); } static bool diff --git a/src/auth/sasl-server-mech-digest-md5.c b/src/auth/sasl-server-mech-digest-md5.c index f075f82ed8..66c2af4e92 100644 --- a/src/auth/sasl-server-mech-digest-md5.c +++ b/src/auth/sasl-server-mech-digest-md5.c @@ -226,8 +226,8 @@ verify_credentials(struct auth_request *auth_request, } } - auth_request_success(auth_request, request->rspauth, - strlen(request->rspauth)); + sasl_server_request_success(auth_request, request->rspauth, + strlen(request->rspauth)); } static bool parse_next(char **data, char **key, char **value) diff --git a/src/auth/sasl-server-mech-gssapi.c b/src/auth/sasl-server-mech-gssapi.c index 3c74fc2ef7..7d022243aa 100644 --- a/src/auth/sasl-server-mech-gssapi.c +++ b/src/auth/sasl-server-mech-gssapi.c @@ -524,7 +524,7 @@ gssapi_credentials_callback(enum passdb_result result, } if (mech_gssapi_userok(request, auth_request->fields.user) == 0) - auth_request_success(auth_request, NULL, 0); + sasl_server_request_success(auth_request, NULL, 0); else auth_request_fail(auth_request); } diff --git a/src/auth/sasl-server-mech-oauth2.c b/src/auth/sasl-server-mech-oauth2.c index 6a3c762170..bbdcfe492c 100644 --- a/src/auth/sasl-server-mech-oauth2.c +++ b/src/auth/sasl-server-mech-oauth2.c @@ -100,7 +100,7 @@ void sasl_server_oauth2_request_succeed(struct auth_request *request) container_of(request, struct oauth2_auth_request, request); i_assert(oauth2_req->verifying_token); - auth_request_success(request, "", 0); + sasl_server_request_success(request, "", 0); } void sasl_server_oauth2_request_fail( diff --git a/src/auth/sasl-server-mech-otp.c b/src/auth/sasl-server-mech-otp.c index 49d2bcca39..81f839d61c 100644 --- a/src/auth/sasl-server-mech-otp.c +++ b/src/auth/sasl-server-mech-otp.c @@ -174,7 +174,7 @@ otp_set_credentials_callback(bool success, struct auth_request *auth_request) auth_request); if (success) - auth_request_success(auth_request, "", 0); + sasl_server_request_success(auth_request, "", 0); else { auth_request_internal_failure(auth_request); otp_unlock(request); diff --git a/src/auth/sasl-server-mech-plain-common.c b/src/auth/sasl-server-mech-plain-common.c index f36f94efb2..9d2a9bbf2f 100644 --- a/src/auth/sasl-server-mech-plain-common.c +++ b/src/auth/sasl-server-mech-plain-common.c @@ -10,7 +10,7 @@ void sasl_server_mech_plain_verify_callback(enum passdb_result result, { switch (result) { case PASSDB_RESULT_OK: - auth_request_success(request, "", 0); + sasl_server_request_success(request, "", 0); break; case PASSDB_RESULT_INTERNAL_FAILURE: auth_request_internal_failure(request); diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c index 10c2fd956c..da05460f5b 100644 --- a/src/auth/sasl-server-mech-scram.c +++ b/src/auth/sasl-server-mech-scram.c @@ -162,7 +162,7 @@ void mech_scram_auth_continue(struct auth_request *auth_request, return; } - auth_request_success(auth_request, output, output_len); + sasl_server_request_success(auth_request, output, output_len); } struct auth_request * diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c index 9d554a93e5..7a35af7754 100644 --- a/src/auth/sasl-server-mech-winbind.c +++ b/src/auth/sasl-server-mech-winbind.c @@ -266,10 +266,11 @@ do_auth_continue(struct winbind_auth_request *request, buffer_t *buf; buf = t_base64_decode_str(token[1]); - auth_request_success(&request->auth_request, - buf->data, buf->used); + sasl_server_request_success(&request->auth_request, + buf->data, buf->used); } else { - auth_request_success(&request->auth_request, "", 0); + sasl_server_request_success(&request->auth_request, + "", 0); } return HR_OK; } else if (strcmp(token[0], "BH") == 0) { diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h index 616534dae4..2bd3d3ebeb 100644 --- a/src/auth/sasl-server-protected.h +++ b/src/auth/sasl-server-protected.h @@ -69,5 +69,7 @@ void mech_oauth2_initialize(void); void sasl_server_request_output(struct auth_request *request, const void *data, size_t data_size); +void sasl_server_request_success(struct auth_request *request, + const void *data, size_t data_size); #endif diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c index 7d22729f72..6e5efc5ee6 100644 --- a/src/auth/sasl-server-request.c +++ b/src/auth/sasl-server-request.c @@ -19,3 +19,14 @@ void sasl_server_request_output(struct auth_request *request, }; auth_sasl_request_output(request, &output); } + +void sasl_server_request_success(struct auth_request *request, + const void *data, size_t data_size) +{ + const struct sasl_server_output output = { + .status = SASL_SERVER_OUTPUT_SUCCESS, + .data = data, + .data_size = data_size, + }; + auth_sasl_request_output(request, &output); +}