Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT REVIEW #7730

Closed
wants to merge 2 commits into from
Closed

DO NOT REVIEW #7730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cacece
LDAP: Make connection messages homogeneous
aplopez Dec 2, 2024
166345b
GROUPS: Filter the members
aplopez Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/providers/ldap/ldap_id.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,8 +1211,18 @@ struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
state->non_posix = true;
}

/* Should group members be ignored unconditionally or base on
* ignore_group_members or not at all ? */
const char **filter;
const char *member_filter[2];
member_filter[0] = (const char *) ctx->opts->group_map[SDAP_AT_GROUP_MEMBER].name;
member_filter[1] = NULL;

// [ALE] filter = state->domain->ignore_group_members ? (const char **) member_filter : NULL;
Dismissed Show dismissed Hide dismissed
filter = (const char **) member_filter;

ret = build_attrs_from_map(state, ctx->opts->group_map, SDAP_OPTS_GROUP,
NULL, &state->attrs, NULL);
filter, &state->attrs, NULL);
if (ret != EOK) goto fail;

ret = groups_by_user_retry(req);
Expand Down
4 changes: 4 additions & 0 deletions src/providers/ldap/sdap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,6 +1621,10 @@ int build_attrs_from_map(TALLOC_CTX *memctx,
if (map[i].name && !attr_is_filtered(map[i].name, filter)) {
attrs[j] = map[i].name;
j++;
DEBUG(SSSDBG_TRACE_INTERNAL, "[ALE] Keeping attribute: %s\n", map[i].name);
}
else {
DEBUG(SSSDBG_TRACE_INTERNAL, "[ALE] Filtering attribute: %s\n", map[i].name);
}
}
attrs[j] = NULL;
Expand Down
38 changes: 23 additions & 15 deletions src/providers/ldap/sdap_async.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@ static void sdap_process_message(struct tevent_context *ev,
/* shouldn't happen */
if (op->done) {
DEBUG(SSSDBG_OP_FAILURE,
"Operation [%p] already handled (type: %0x)\n", op, msgtype);
"Operation [%d] already handled (type: %0x)\n", op->msgid, msgtype);
ldap_msgfree(msg);
return;
}

DEBUG(SSSDBG_TRACE_ALL,
"Message type: [%s]\n", sdap_ldap_result_str(msgtype));
"Operation [%d] message type: [%s]\n", op->msgid, sdap_ldap_result_str(msgtype));

switch (msgtype) {
case LDAP_RES_SEARCH_ENTRY:
Expand All @@ -385,7 +385,8 @@ static void sdap_process_message(struct tevent_context *ev,
default:
/* unknown msg type?? */
DEBUG(SSSDBG_CRIT_FAILURE,
"Couldn't figure out the msg type! [%0x]\n", msgtype);
"Couldn't figure out the msg type [%0x] for operation [%d]!\n",
msgtype, op->msgid);
ldap_msgfree(msg);
return;
}
Expand Down Expand Up @@ -471,15 +472,15 @@ static int sdap_op_destructor(void *mem)
DLIST_REMOVE(op->sh->ops, op);

if (op->done) {
DEBUG(SSSDBG_TRACE_INTERNAL, "Operation %d finished\n", op->msgid);
DEBUG(SSSDBG_TRACE_INTERNAL, "Operation [%d] finished\n", op->msgid);
return 0;
}

/* we don't check the result here, if a message was really abandoned,
* hopefully the server will get an abandon.
* If the operation was already fully completed, this is going to be
* just a noop */
DEBUG(SSSDBG_TRACE_LIBS, "Abandoning operation %d\n", op->msgid);
DEBUG(SSSDBG_TRACE_LIBS, "Abandoning operation [%d]\n", op->msgid);
ldap_abandon_ext(op->sh->ldap, op->msgid, NULL, NULL);

return 0;
Expand All @@ -491,12 +492,14 @@ static void sdap_op_timeout(struct tevent_req *req)

/* should never happen, but just in case */
if (op->done) {
DEBUG(SSSDBG_OP_FAILURE, "Timeout happened after op was finished !?\n");
DEBUG(SSSDBG_OP_FAILURE,
"Timeout happened after operation [%d] was finished !?\n",
op->msgid);
return;
}

/* signal the caller that we have a timeout */
DEBUG(SSSDBG_TRACE_LIBS, "Issuing timeout [ldap_opt_timeout] for message id %d\n", op->msgid);
DEBUG(SSSDBG_TRACE_LIBS, "Issuing timeout for operation [%d]\n", op->msgid);
sdap_call_op_callback(op, NULL, ETIMEDOUT);
}

Expand All @@ -517,7 +520,9 @@ int sdap_op_add(TALLOC_CTX *memctx, struct tevent_context *ev,
if (stat_info != NULL) {
op->stat_info = talloc_strdup(op, stat_info);
if (op->stat_info == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "Failed to copy stat_info, ignored.\n");
DEBUG(SSSDBG_OP_FAILURE,
"Failed to copy stat_info for operation [%d], ignored.\n",
op->msgid);
}
}
op->callback = callback;
Expand All @@ -526,7 +531,7 @@ int sdap_op_add(TALLOC_CTX *memctx, struct tevent_context *ev,
op->chain_id = sss_chain_id_get();

DEBUG(SSSDBG_TRACE_INTERNAL,
"New operation %d timeout %d\n", op->msgid, timeout);
"New operation [%d] timeout %d\n", op->msgid, timeout);

/* check if we need to set a timeout */
if (timeout) {
Expand Down Expand Up @@ -728,7 +733,7 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op,
&response_controls, 0);
if (ret != LDAP_SUCCESS) {
DEBUG(SSSDBG_OP_FAILURE,
"ldap_parse_result failed (%d)\n", state->op->msgid);
"ldap_parse_result failed for operation [%d]\n", state->op->msgid);
ret = ERR_INTERNAL;
goto done;
}
Expand Down Expand Up @@ -898,8 +903,9 @@ static void sdap_modify_done(struct sdap_op *op,
lret = ldap_parse_result(state->sh->ldap, reply->msg, &result,
NULL, &errmsg, NULL, NULL, 0);
if (lret != LDAP_SUCCESS) {
DEBUG(SSSDBG_OP_FAILURE, "ldap_parse_result failed (%d)\n",
state->op->msgid);
DEBUG(SSSDBG_OP_FAILURE,
"ldap_parse_result failed for operation [%d]\n",
state->op->msgid);
ret = EIO;
goto done;
}
Expand Down Expand Up @@ -1693,7 +1699,7 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req)
}
goto done;
}
DEBUG(SSSDBG_TRACE_INTERNAL, "ldap_search_ext called, msgid = %d\n", msgid);
DEBUG(SSSDBG_TRACE_INTERNAL, "ldap_search_ext called, operation [%d]\n", msgid);

stat_info = talloc_asprintf(state, "server: [%s] filter: [%s] base: [%s]",
sdap_get_server_peer_str_safe(state->sh),
Expand Down Expand Up @@ -1784,7 +1790,8 @@ static void sdap_get_generic_op_finished(struct sdap_op *op,
&refs, NULL, 0);
if (ret != LDAP_SUCCESS) {
DEBUG(SSSDBG_OP_FAILURE,
"ldap_parse_reference failed (%d)\n", state->op->msgid);
"ldap_parse_reference failed for operation [%d]\n",
state->op->msgid);
tevent_req_error(req, EIO);
return;
}
Expand Down Expand Up @@ -1823,7 +1830,8 @@ static void sdap_get_generic_op_finished(struct sdap_op *op,
&returned_controls, 0);
if (ret != LDAP_SUCCESS) {
DEBUG(SSSDBG_OP_FAILURE,
"ldap_parse_result failed (%d)\n", state->op->msgid);
"ldap_parse_result failed for operation [%d]\n",
state->op->msgid);
tevent_req_error(req, EIO);
return;
}
Expand Down
18 changes: 13 additions & 5 deletions src/providers/ldap/sdap_async_initgroups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,23 +959,31 @@ static errno_t sdap_initgr_nested_deref_search(struct tevent_req *req)

state = tevent_req_data(req, struct sdap_initgr_nested_state);

/* [ALE]
* Is this map really needed?
* I think the mapping is already applied to state->grp_attrs. */
maps = talloc_array(state, struct sdap_attr_map_info, num_maps+1);
if (!maps) return ENOMEM;

maps[0].map = state->opts->group_map;
maps[0].num_attrs = SDAP_OPTS_GROUP;
maps[1].map = NULL;

ret = build_attrs_from_map(state, state->opts->group_map, SDAP_OPTS_GROUP,
NULL, &sdap_attrs, NULL);
if (ret != EOK) goto fail;

timeout = dp_opt_get_int(state->opts->basic, SDAP_SEARCH_TIMEOUT);

const char **p;
for (p = state->grp_attrs; *p != NULL; p++) {
DEBUG(SSSDBG_TRACE_INTERNAL, "[ALE] Reusing attribute: %s\n", *p);
}
int i;
for (i = 0; i < SDAP_OPTS_GROUP; i++) {
DEBUG(SSSDBG_TRACE_INTERNAL, "[ALE] Map had attribute: %s\n", state->opts->group_map[i].name);
}

subreq = sdap_deref_search_send(state, state->ev, state->opts,
state->sh, state->orig_dn,
state->user_map[SDAP_AT_USER_MEMBEROF].name,
sdap_attrs, num_maps, maps, timeout);
state->grp_attrs, num_maps, maps, timeout);
if (!subreq) {
ret = EIO;
goto fail;
Expand Down
Loading