login-common: sasl-server - Return server final response data in success callback

diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 6db4884a4cf51dc645c7e0a61a7c00a2b6ae5789..cfcfe798c6eaea7c03e4420d8d88cec1a8e7d00b 100644 (file)
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -208,6 +208,7 @@ struct client {
        enum sasl_server_reply delayed_final_reply;
        const char *const *final_args;
        const char *const *auth_passdb_args;
+       const char *auth_success_data;
        struct anvil_query *anvil_query;
        struct anvil_request *anvil_request;
 

diff --git a/src/login-common/sasl-server.c b/src/login-common/sasl-server.c
index fc415befdeb18467845ae3fd5f0964e7f900b6ef..99c4c8ab51d9eea5d616d322755c331f34d51bba 100644 (file)
--- a/src/login-common/sasl-server.c
+++ b/src/login-common/sasl-server.c
@@ -144,6 +144,7 @@ login_callback(const struct login_reply *reply, void *context)
                switch (reply->status) {
                case LOGIN_REPLY_STATUS_OK:
                        sasl_reply = SASL_SERVER_REPLY_SUCCESS;
+                       data = client->auth_success_data;
                        break;
                case LOGIN_REPLY_STATUS_INTERNAL_ERROR:
                        sasl_reply = SASL_SERVER_REPLY_MASTER_FAILED;
@@ -319,15 +320,18 @@ args_parse_user(struct client *client, const char *key, const char *value)
 }
 
 static void
-sasl_server_auth_success_finish(struct client *client, const char *const *args)
+sasl_server_auth_success_finish(struct client *client, const char *data,
+                               const char *const *args)
 {
        if (client->auth_nologin) {
                client->authenticating = FALSE;
                call_client_callback(client, SASL_SERVER_REPLY_SUCCESS,
-                                    NULL, args);
+                                    data, args);
        } else if (!sasl_server_check_login(client)) {
                i_assert(!client->authenticating);
        } else {
+               client->auth_success_data =
+                       p_strdup(client->preproxy_pool, data);
                anvil_check_too_many_connections(client);
        }
 }
@@ -396,7 +400,7 @@ authenticate_callback(struct auth_client_request *request,
                        client->sasl_callback(client, SASL_SERVER_REPLY_CONTINUE,
                                              data_base64, NULL);
                } else {
-                       sasl_server_auth_success_finish(client, args);
+                       sasl_server_auth_success_finish(client, data_base64, args);
                }
                break;
        case AUTH_REQUEST_STATUS_INTERNAL_FAIL:
@@ -544,6 +548,7 @@ void sasl_server_auth_begin(struct client *client, const char *mech_name,
        i_free(client->auth_mech_name);
        client->auth_mech_name = str_ucase(i_strdup(mech_name));
        client->auth_anonymous = FALSE;
+       client->auth_success_data = NULL;
        client->auth_flags = flags;
        client->sasl_callback = callback;
 
@@ -649,7 +654,7 @@ bool sasl_server_auth_handle_delayed_final(struct client *client)
        if (client->delayed_final_reply == SASL_SERVER_REPLY_SUCCESS) {
                const char *const *args = client->final_args;
 
-               sasl_server_auth_success_finish(client, args);
+               sasl_server_auth_success_finish(client, NULL, args);
                return TRUE;
        }