Skip to content

Commit

Permalink
sdap: add set_non_posix parameter
Browse files Browse the repository at this point in the history 
This patch adds a new parameter set_non_posix to the user and group
lookup calls. Currently the domain type is used to determine if the
search should be restricted to POSIX objects or not. The new option
allows to drop this restriction explicitly to look up non-POSIX objects.

Resolves: SSSD#5708

Reviewed-by: Justin Stephenson <jstephen@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit 5f63d9b)

Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
  • Loading branch information
@sumit-bose @etrunko
sumit-bose authored and etrunko committed Feb 26, 2024
1 parent 5658ec4 commit ee38fa7
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 29 deletions.
1 change: 1 addition & 0 deletions src/providers/ad/ad_gpo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2110,6 +2110,7 @@ ad_gpo_connect_done(struct tevent_req *subreq)
state->host_fqdn,
BE_FILTER_NAME,
NULL,
true,
true);
tevent_req_set_callback(subreq, ad_gpo_target_dn_retrieval_done, req);

Expand Down
2 changes: 1 addition & 1 deletion src/providers/ipa/ipa_subdomains_ext_groups.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ static void ipa_add_ad_memberships_get_next(struct tevent_req *req)
state->sdap_id_ctx->conn,
fq_name,
BE_FILTER_NAME,
false, false);
false, false, false);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
ret = ENOMEM;
Expand Down
6 changes: 4 additions & 2 deletions src/providers/ldap/ldap_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
const char *name,
int filter_type,
bool noexist_delete,
bool no_members);
bool no_members,
bool set_non_posix);
int groups_get_recv(struct tevent_req *req, int *dp_error_out, int *sdap_ret);

struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
Expand All @@ -302,7 +303,8 @@ struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
const char *extra_value,
bool noexist_delete);
bool noexist_delete,
bool set_non_posix);

int groups_by_user_recv(struct tevent_req *req, int *dp_error_out, int *sdap_ret);

Expand Down
38 changes: 23 additions & 15 deletions src/providers/ldap/ldap_id.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
const char *extra_value,
bool noexist_delete)
bool noexist_delete,
bool set_non_posix)
{
struct tevent_req *req;
struct users_get_state *state;
Expand Down Expand Up @@ -202,7 +203,7 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx,
state->filter_value = filter_value;
state->filter_type = filter_type;

if (state->domain->type == DOM_TYPE_APPLICATION) {
if (state->domain->type == DOM_TYPE_APPLICATION || set_non_posix) {
state->non_posix = true;
}

Expand Down Expand Up @@ -582,7 +583,8 @@ static void users_get_done(struct tevent_req *subreq)
ret = sdap_fallback_local_user(state, state->shortname, uid, &usr_attrs);
if (ret == EOK) {
ret = sdap_save_user(state, state->ctx->opts, state->domain,
usr_attrs[0], NULL, NULL, 0);
usr_attrs[0], NULL, NULL, 0,
state->non_posix);
}
}
}
Expand Down Expand Up @@ -665,7 +667,8 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
bool noexist_delete,
bool no_members)
bool no_members,
bool set_non_posix)
{
struct tevent_req *req;
struct groups_get_state *state;
Expand Down Expand Up @@ -703,7 +706,7 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx,
state->filter_value = filter_value;
state->filter_type = filter_type;

if (state->domain->type == DOM_TYPE_APPLICATION) {
if (state->domain->type == DOM_TYPE_APPLICATION || set_non_posix) {
state->non_posix = true;
}

Expand Down Expand Up @@ -991,7 +994,8 @@ static void groups_get_done(struct tevent_req *subreq)
state->filter_value,
state->filter_type,
NULL,
state->noexist_delete);
state->noexist_delete,
false);
if (subreq == NULL) {
tevent_req_error(req, ENOMEM);
return;
Expand Down Expand Up @@ -1159,7 +1163,8 @@ struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
const char *extra_value,
bool noexist_delete)
bool noexist_delete,
bool set_non_posix)
{
struct tevent_req *req;
struct groups_by_user_state *state;
Expand Down Expand Up @@ -1188,7 +1193,7 @@ struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx,
state->domain = sdom->dom;
state->sysdb = sdom->dom->sysdb;

if (state->domain->type == DOM_TYPE_APPLICATION) {
if (state->domain->type == DOM_TYPE_APPLICATION || set_non_posix) {
state->non_posix = true;
}

Expand Down Expand Up @@ -1252,7 +1257,8 @@ static void groups_by_user_connect_done(struct tevent_req *subreq)
state->filter_value,
state->filter_type,
state->extra_value,
state->attrs);
state->attrs,
state->non_posix);
if (!subreq) {
tevent_req_error(req, ENOMEM);
return;
Expand Down Expand Up @@ -1421,15 +1427,16 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
ar->filter_value,
ar->filter_type,
ar->extra_value,
noexist_delete);
noexist_delete,
false);
break;

case BE_REQ_GROUP: /* group */
subreq = groups_get_send(state, be_ctx->ev, id_ctx,
sdom, conn,
ar->filter_value,
ar->filter_type,
noexist_delete, false);
noexist_delete, false, false);
break;

case BE_REQ_INITGROUPS: /* init groups for user */
Expand All @@ -1446,7 +1453,7 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
ar->filter_value,
ar->filter_type,
ar->extra_value,
noexist_delete);
noexist_delete, false);
break;

case BE_REQ_SUBID_RANGES:
Expand Down Expand Up @@ -1545,7 +1552,8 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx,
ar->filter_value,
ar->filter_type,
ar->extra_value,
noexist_delete);
noexist_delete,
false);
break;

default: /*fail*/
Expand Down Expand Up @@ -1741,7 +1749,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx,
subreq = groups_get_send(req, state->ev, state->id_ctx,
state->sdom, state->conn,
state->filter_val, state->filter_type,
state->noexist_delete, false);
state->noexist_delete, false, false);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n");
ret = ENOMEM;
Expand Down Expand Up @@ -1795,7 +1803,7 @@ static void get_user_and_group_groups_done(struct tevent_req *subreq)
subreq = users_get_send(req, state->ev, state->id_ctx,
state->sdom, user_conn,
state->filter_val, state->filter_type, NULL,
state->noexist_delete);
state->noexist_delete, false);
if (subreq == NULL) {
DEBUG(SSSDBG_OP_FAILURE, "users_get_send failed.\n");
tevent_req_error(req, ENOMEM);
Expand Down
3 changes: 2 additions & 1 deletion src/providers/ldap/sdap_async.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx,
const char *name,
int filter_type,
const char *extra_value,
const char **grp_attrs);
const char **grp_attrs,
bool set_non_posix);
int sdap_get_initgr_recv(struct tevent_req *req);

struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx,
Expand Down
9 changes: 5 additions & 4 deletions src/providers/ldap/sdap_async_initgroups.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2718,7 +2718,8 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx,
const char *filter_value,
int filter_type,
const char *extra_value,
const char **grp_attrs)
const char **grp_attrs,
bool set_non_posix)
{
struct tevent_req *req;
struct sdap_get_initgr_state *state;
Expand Down Expand Up @@ -2754,7 +2755,7 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx,
goto done;
}

if (state->dom->type == DOM_TYPE_APPLICATION) {
if (state->dom->type == DOM_TYPE_APPLICATION || set_non_posix) {
state->non_posix = true;
}

Expand Down Expand Up @@ -3082,7 +3083,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
DEBUG(SSSDBG_TRACE_ALL, "Storing the user\n");

ret = sdap_save_user(state, state->opts, state->dom, state->orig_user,
NULL, NULL, 0);
NULL, NULL, 0, state->non_posix);
if (ret) {
goto fail;
}
Expand Down Expand Up @@ -3418,7 +3419,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq)
subreq = groups_get_send(req, state->ev, state->id_ctx,
state->id_ctx->opts->sdom, state->conn,
gid, BE_FILTER_IDNUM, false,
false);
false, false);
if (!subreq) {
ret = ENOMEM;
goto done;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/ldap/sdap_async_initgroups_ad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static errno_t sdap_ad_resolve_sids_step(struct tevent_req *req)

subreq = groups_get_send(state, state->ev, state->id_ctx, sdap_domain,
state->conn, state->current_sid,
BE_FILTER_SECID, false, true);
BE_FILTER_SECID, false, true, false);
if (subreq == NULL) {
return ENOMEM;
}
Expand Down
9 changes: 5 additions & 4 deletions src/providers/ldap/sdap_async_users.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ int sdap_save_user(TALLOC_CTX *memctx,
struct sysdb_attrs *attrs,
struct sysdb_attrs *mapped_attrs,
char **_usn_value,
time_t now)
time_t now,
bool set_non_posix)
{
struct ldb_message_element *el;
int ret;
Expand Down Expand Up @@ -352,7 +353,7 @@ int sdap_save_user(TALLOC_CTX *memctx,
ret = sysdb_attrs_get_uint32_t(attrs,
opts->user_map[SDAP_AT_USER_UID].sys_name,
&uid);
if (ret == ENOENT && dom->type == DOM_TYPE_APPLICATION) {
if (ret == ENOENT && (dom->type == DOM_TYPE_APPLICATION || set_non_posix)) {
DEBUG(SSSDBG_TRACE_INTERNAL,
"Marking object as non-POSIX and setting ID=0!\n");
ret = sdap_set_non_posix_flag(user_attrs,
Expand Down Expand Up @@ -450,7 +451,7 @@ int sdap_save_user(TALLOC_CTX *memctx,
ret = sysdb_attrs_get_uint32_t(attrs,
opts->user_map[SDAP_AT_USER_GID].sys_name,
&gid);
if (ret == ENOENT && dom->type == DOM_TYPE_APPLICATION) {
if (ret == ENOENT && (dom->type == DOM_TYPE_APPLICATION || set_non_posix)) {
DEBUG(SSSDBG_TRACE_INTERNAL,
"Marking object as non-POSIX and setting ID=0!\n");
ret = sdap_set_non_posix_flag(attrs,
Expand Down Expand Up @@ -696,7 +697,7 @@ int sdap_save_users(TALLOC_CTX *memctx,
usn_value = NULL;

ret = sdap_save_user(tmpctx, opts, dom, users[i], mapped_attrs,
&usn_value, now);
&usn_value, now, false);

/* Do not fail completely on errors.
* Just report the failure to save and go on */
Expand Down
3 changes: 2 additions & 1 deletion src/providers/ldap/sdap_users.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ int sdap_save_user(TALLOC_CTX *memctx,
struct sysdb_attrs *attrs,
struct sysdb_attrs *mapped_attrs,
char **_usn_value,
time_t now);
time_t now,
bool set_non_posix);

#endif /* _SDAP_USERS_H_ */

0 comments on commit ee38fa7

Please sign in to comment.