diff options
author | Sumit Bose <sbose@redhat.com> | 2013-06-14 12:49:46 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-06-28 20:20:59 +0200 |
commit | 8ff0aba893d8da1a8163ccaf9ad2c5b6bccd121f (patch) | |
tree | 5f6aab6057d152d641c7c01506b3fccbbec0513e | |
parent | b56b06e199f15a8a840b36bc7cb8010e39ae761d (diff) | |
download | sssd-8ff0aba893d8da1a8163ccaf9ad2c5b6bccd121f.tar.gz sssd-8ff0aba893d8da1a8163ccaf9ad2c5b6bccd121f.tar.bz2 sssd-8ff0aba893d8da1a8163ccaf9ad2c5b6bccd121f.zip |
Add ipa_idmap_init()
Use the sdap_idmap context for the IPA provider as well.
https://fedorahosted.org/sssd/ticket/1961
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | src/providers/ipa/ipa_common.h | 3 | ||||
-rw-r--r-- | src/providers/ipa/ipa_idmap.c | 271 | ||||
-rw-r--r-- | src/providers/ipa/ipa_init.c | 2 |
4 files changed, 276 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 62f21af6..da1d26c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1574,6 +1574,7 @@ libsss_ipa_la_SOURCES = \ src/providers/ipa/ipa_selinux_maps.c \ src/providers/ipa/ipa_selinux_common.c \ src/providers/ipa/ipa_srv.c \ + src/providers/ipa/ipa_idmap.c \ src/util/user_info_msg.c \ src/util/find_uid.c \ src/util/sss_ldap.c \ diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 01130c48..6dacdc57 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -183,4 +183,7 @@ int ipa_sudo_init(struct be_ctx *be_ctx, struct bet_ops **ops, void **pvt_data); +errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, + struct sdap_id_ctx *id_ctx, + struct sdap_idmap_ctx **_idmap_ctx); #endif /* _IPA_COMMON_H_ */ diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c new file mode 100644 index 00000000..a02724f3 --- /dev/null +++ b/src/providers/ipa/ipa_idmap.c @@ -0,0 +1,271 @@ +/* + SSSD + + Authors: + Sumit Bose <sbose@redhat.com> + + Copyright (C) 2013 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +#include "util/util.h" +#include "providers/ldap/sdap_idmap.h" + +#define IPA_RANGE_LOCAL "ipa-local" +#define IPA_RANGE_AD_TRUST "ipa-ad-trust" +#define IPA_RANGE_AD_TRUST_POSIX "ipa-ad-trust-posix" + +static void * +ipa_idmap_talloc(size_t size, void *pvt) +{ + return talloc_size(pvt, size); +} + +static void +ipa_idmap_talloc_free(void *ptr, void *pvt) +{ + talloc_free(ptr); +} + +errno_t ipa_idmap_find_new_domain(struct sdap_idmap_ctx *idmap_ctx, + const char *dom_name, + const char *dom_sid_str) +{ + int ret; + size_t range_count; + struct range_info **range_list; + TALLOC_CTX *tmp_ctx; + size_t c; + enum idmap_error_code err; + struct range_info *r; + struct sss_idmap_range range; + uint32_t rid; + bool external_mapping; + char *name; + char *sid; + + tmp_ctx = talloc_new(NULL); + if (tmp_ctx == NULL) { + DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + return ENOMEM; + } + + ret = sysdb_get_ranges(tmp_ctx, idmap_ctx->id_ctx->be->domain->sysdb, + &range_count, &range_list); + if (ret != EOK) { + DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_ranges failed.\n")); + goto done; + } + + for (c = 0; c < range_count; c++) { + r = range_list[c]; + + if (r->range_type == NULL) { + /* Older IPA servers might not have the range_type attribute, but + * only support local ranges and trusts with algorithmic mapping. */ + + if (r->trusted_dom_sid == NULL && r->secondary_base_rid != 0) { + /* local IPA domain */ + rid = 0; + external_mapping = true; + name = idmap_ctx->id_ctx->be->domain->name; + sid = NULL; + } else if (r->trusted_dom_sid != NULL + && r->secondary_base_rid == 0) { + /* trusted domain */ + rid = r->base_rid; + external_mapping = false; + name = r->trusted_dom_sid; + sid = r->trusted_dom_sid; + } else { + DEBUG(SSSDBG_MINOR_FAILURE, ("Cannot determine range type, " \ + "skipping id ange [%s].\n", + r->name)); + continue; + } + } else { + if (strcmp(r->range_type, IPA_RANGE_LOCAL) == 0) { + rid = 0; + external_mapping = true; + name = idmap_ctx->id_ctx->be->domain->name; + sid = NULL; + } else if (strcmp(r->range_type, IPA_RANGE_AD_TRUST_POSIX) == 0) { + rid = 0; + external_mapping = true; + name = r->trusted_dom_sid; + sid = r->trusted_dom_sid; + } else if (strcmp(r->range_type, IPA_RANGE_AD_TRUST) == 0) { + rid = r->base_rid; + external_mapping = false; + name = r->trusted_dom_sid; + sid = r->trusted_dom_sid; + } else { + DEBUG(SSSDBG_MINOR_FAILURE, ("Range type [%s] not supported, " \ + "skipping id range [%s].\n", + r->range_type, r->name)); + continue; + } + } + + range.min = r->base_id; + range.max = r->base_id + r->id_range_size -1; + err = sss_idmap_add_domain_ex(idmap_ctx->map, name, sid, &range, + r->name, rid, external_mapping); + if (err != IDMAP_SUCCESS && err != IDMAP_COLLISION) { + DEBUG(SSSDBG_CRIT_FAILURE, ("Could not add range [%s] to ID map\n", + r->name)); + ret = EIO; + goto done; + } + } + + ret = EOK; + +done: + talloc_free(tmp_ctx); + + return ret; +} + +errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, + struct sdap_id_ctx *id_ctx, + struct sdap_idmap_ctx **_idmap_ctx) +{ + errno_t ret; + TALLOC_CTX *tmp_ctx; + enum idmap_error_code err; + size_t c; + struct sdap_idmap_ctx *idmap_ctx = NULL; + struct sysdb_ctx *sysdb = id_ctx->be->domain->sysdb; + size_t range_count; + struct range_info **range_list; + struct range_info *r; + struct sss_idmap_range range; + uint32_t rid; + bool external_mapping; + char *name; + char *sid; + + tmp_ctx = talloc_new(NULL); + if (!tmp_ctx) return ENOMEM; + + idmap_ctx = talloc_zero(tmp_ctx, struct sdap_idmap_ctx); + if (!idmap_ctx) { + ret = ENOMEM; + goto done; + } + idmap_ctx->id_ctx = id_ctx; + idmap_ctx->find_new_domain = ipa_idmap_find_new_domain; + + /* Initialize the map */ + err = sss_idmap_init(ipa_idmap_talloc, idmap_ctx, + ipa_idmap_talloc_free, + &idmap_ctx->map); + if (err != IDMAP_SUCCESS) { + DEBUG(SSSDBG_CRIT_FAILURE, + ("Could not initialize the ID map: [%s]\n", + idmap_error_string(err))); + if (err == IDMAP_OUT_OF_MEMORY) { + ret = ENOMEM; + } else { + ret = EINVAL; + } + goto done; + } + + + /* Read in any existing mappings from the cache */ + ret = sysdb_get_ranges(tmp_ctx, sysdb, &range_count, &range_list); + if (ret != EOK && ret != ENOENT) { + DEBUG(SSSDBG_FATAL_FAILURE, + ("Could not read ranges from the cache: [%s]\n", + strerror(ret))); + goto done; + } + + DEBUG(SSSDBG_CONF_SETTINGS, + ("Initializing [%d] domains for ID-mapping\n", range_count)); + + for (c = 0; c < range_count; c++) { + + r = range_list[c]; + + if (r->range_type == NULL) { + /* Older IPA servers might not have the range_type attribute, but + * only support local ranges and trusts with algorithmic mapping. */ + + if (r->trusted_dom_sid == NULL && r->secondary_base_rid != 0) { + /* local IPA domain */ + rid = 0; + external_mapping = true; + sid = NULL; + name = id_ctx->be->domain->name; + } else if (r->trusted_dom_sid != NULL + && r->secondary_base_rid == 0) { + /* trusted domain */ + rid = r->base_rid; + external_mapping = false; + sid = r->trusted_dom_sid; + name = sid; + } else { + DEBUG(SSSDBG_MINOR_FAILURE, ("Cannot determine range type, " \ + "skipping id ange [%s].\n", + r->name)); + continue; + } + } else { + if (strcmp(r->range_type, IPA_RANGE_LOCAL) == 0) { + rid = 0; + external_mapping = true; + sid = NULL; + name = id_ctx->be->domain->name; + } else if (strcmp(r->range_type, IPA_RANGE_AD_TRUST_POSIX) == 0) { + rid = 0; + external_mapping = true; + sid = r->trusted_dom_sid; + name = sid; + } else if (strcmp(r->range_type, IPA_RANGE_AD_TRUST) == 0) { + rid = r->base_rid; + external_mapping = false; + sid = r->trusted_dom_sid; + name = sid; + } else { + DEBUG(SSSDBG_MINOR_FAILURE, ("Range type [%s] not supported, " \ + "skipping id range [%s].\n", + r->range_type, r->name)); + continue; + } + } + + range.min = r->base_id; + range.max = r->base_id + r->id_range_size -1; + err = sss_idmap_add_domain_ex(idmap_ctx->map, name, sid, &range, + r->name, rid, external_mapping); + if (err != IDMAP_SUCCESS) { + DEBUG(SSSDBG_CRIT_FAILURE, ("Could not add range [%s] to ID map\n", + r->name)); + ret = EIO; + goto done; + } + } + + *_idmap_ctx = talloc_steal(mem_ctx, idmap_ctx); + ret = EOK; + +done: + talloc_free(tmp_ctx); + return ret; +} diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index 77a51433..7297fc93 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -188,7 +188,7 @@ int sssm_ipa_id_init(struct be_ctx *bectx, /* Set up the ID mapping object */ - ret = sdap_idmap_init(sdap_ctx, sdap_ctx, &sdap_ctx->opts->idmap_ctx); + ret = ipa_idmap_init(sdap_ctx, sdap_ctx, &sdap_ctx->opts->idmap_ctx); if (ret != EOK) goto done; ret = sdap_id_setup_tasks(sdap_ctx); |