Allow p_result to be set for rlm_ldap_find_user_async

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 2570e564b5af097ecccaa1c886217ddc88a71275..1d0077591dce715602cd98183cff400e646bcaeb 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -941,7 +941,10 @@ static unlang_action_t ldap_group_xlat_user_find(UNUSED unlang_result_t *p_resul
 
        xlat_ctx->basedn = &xlat_ctx->env_data->user_base;
 
-       return rlm_ldap_find_user_async(xlat_ctx, xlat_ctx->inst, request, xlat_ctx->basedn, xlat_ctx->filter,
+       return rlm_ldap_find_user_async(xlat_ctx,
+                                       /* discard, only used by xlats */NULL,
+                                       xlat_ctx->inst, request,
+                                       xlat_ctx->basedn, xlat_ctx->filter,
                                        xlat_ctx->ttrunk, xlat_ctx->attrs, &xlat_ctx->query);
 }
 
@@ -1037,7 +1040,7 @@ static xlat_arg_parser_t const ldap_group_xlat_arg[] = {
  * @ingroup xlat_functions
  */
 static xlat_action_t ldap_group_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_ctx_t const *xctx,
-                                       request_t *request, fr_value_box_list_t *in)
+                                    request_t *request, fr_value_box_list_t *in)
 {
        fr_value_box_t                  *vb = NULL, *group_vb = fr_value_box_list_pop_head(in);
        rlm_ldap_t const                *inst = talloc_get_type_abort_const(xctx->mctx->mi->data, rlm_ldap_t);
@@ -1140,7 +1143,7 @@ typedef struct {
  *
  */
 static xlat_action_t ldap_profile_xlat_resume(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_ctx_t const *xctx,
-                                           UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
+                                             UNUSED request_t *request, UNUSED fr_value_box_list_t *in)
 {
        ldap_xlat_profile_ctx_t         *xlat_ctx = talloc_get_type_abort(xctx->rctx, ldap_xlat_profile_ctx_t);
        fr_value_box_t                  *vb;
@@ -1631,7 +1634,21 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize_resume(unlang_result_t *p_
        int                     ldap_errno;
        LDAP                    *handle = fr_ldap_handle_thread_local();
 
-       p_result->rcode = RLM_MODULE_OK;
+       /*
+        *      If a previous async call returned one of the "failure" results just return.
+        */
+       switch (p_result->rcode) {
+       case RLM_MODULE_REJECT:
+       case RLM_MODULE_FAIL:
+       case RLM_MODULE_HANDLED:
+       case RLM_MODULE_INVALID:
+       case RLM_MODULE_DISALLOW:
+               goto finish;
+
+       default:
+               p_result->rcode = RLM_MODULE_OK;
+               break;
+       }
 
        switch (autz_ctx->status) {
        case LDAP_AUTZ_FIND:
@@ -1973,7 +1990,8 @@ static unlang_action_t CC_HINT(nonnull) mod_authorize(unlang_result_t *p_result,
                RETURN_UNLANG_FAIL;
        }
 
-       return rlm_ldap_find_user_async(autz_ctx, autz_ctx->inst, request, &autz_ctx->call_env->user_base,
+       return rlm_ldap_find_user_async(autz_ctx, p_result,
+                                       autz_ctx->inst, request, &autz_ctx->call_env->user_base,
                                        &autz_ctx->call_env->user_filter, autz_ctx->ttrunk, autz_ctx->expanded.attrs,
                                        &autz_ctx->query);
 }
@@ -2240,7 +2258,9 @@ static unlang_action_t CC_HINT(nonnull) mod_modify(unlang_result_t *p_result, mo
         */
        if (!usermod_ctx->dn) {
                /* Pushes a frame for user resolution */
-               if (rlm_ldap_find_user_async(usermod_ctx, usermod_ctx->inst, request,
+               if (rlm_ldap_find_user_async(usermod_ctx,
+                                            p_result,
+                                            usermod_ctx->inst, request,
                                             &usermod_ctx->call_env->user_base,
                                             &usermod_ctx->call_env->user_filter,
                                             usermod_ctx->ttrunk, NULL, NULL) == UNLANG_ACTION_FAIL) {

diff --git a/src/modules/rlm_ldap/rlm_ldap.h b/src/modules/rlm_ldap/rlm_ldap.h
index 405cfaaa5ef520bab6b779318a08a7e6606e490e..b0f7f318f14edd35c8fdf366f3c3d50ba6f85990 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.h
+++ b/src/modules/rlm_ldap/rlm_ldap.h
@@ -254,7 +254,9 @@ static inline char const *rlm_find_user_dn_cached(request_t *request)
        return vp->vp_strvalue;
 }
 
-unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx, rlm_ldap_t const *inst, request_t *request,
+unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx,
+                                        unlang_result_t *p_result,
+                                        rlm_ldap_t const *inst, request_t *request,
                                         fr_value_box_t *base, fr_value_box_t *filter_box,
                                         fr_ldap_thread_trunk_t *ttrunk, char const *attrs[],
                                         fr_ldap_query_t **query_out);

diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c
index 084aac40e4cc82fdaa58b928260655c697e57083..b4f53300092e3f86d59d7a037b87c4eeba2ab131 100644 (file)
--- a/src/modules/rlm_ldap/user.c
+++ b/src/modules/rlm_ldap/user.c
@@ -156,7 +156,9 @@ static void ldap_find_user_async_cancel(UNUSED request_t *request, UNUSED fr_sig
  *     - UNLANG_ACTION_PUSHED_CHILD on success.
  *     - UNLANG_ACTION_FAIL on failure.
  */
-unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx, rlm_ldap_t const *inst, request_t *request,
+unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx,
+                                        unlang_result_t *p_result,
+                                        rlm_ldap_t const *inst, request_t *request,
                                         fr_value_box_t *base, fr_value_box_t *filter,
                                         fr_ldap_thread_trunk_t *ttrunk, char const *attrs[], fr_ldap_query_t **query_out)
 {
@@ -176,8 +178,12 @@ unlang_action_t rlm_ldap_find_user_async(TALLOC_CTX *ctx, rlm_ldap_t const *inst
        };
 
        if (filter) user_ctx->filter = filter->vb_strvalue;
-       if (unlang_function_push(NULL, request, NULL, ldap_find_user_async_result, ldap_find_user_async_cancel,
-                                ~FR_SIGNAL_CANCEL, UNLANG_SUB_FRAME, user_ctx) < 0) {
+       if (unlang_function_push(/* ldap_find_user_async_result sets an rcode based on the search result */ p_result,
+                                request,
+                                NULL,
+                                ldap_find_user_async_result,
+                                ldap_find_user_async_cancel, ~FR_SIGNAL_CANCEL,
+                                UNLANG_SUB_FRAME, user_ctx) < 0) {
                talloc_free(user_ctx);
                return UNLANG_ACTION_FAIL;
        }