>From 5df39c3769e47c263105b21b6bb1e5b92b5f2694 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 2 Dec 2013 14:19:09 +0100 Subject: [PATCH 3/4] NSS: Add option to expand homedir template format LDAP server can contain template for home directory instead of plain string. This patch adds new expand option "%H", which will be replaced with value from configuration option homedir_substring (from sssd.conf) Resolves: https://fedorahosted.org/sssd/ticket/1853 --- src/confdb/confdb.c | 10 ++++++++++ src/confdb/confdb.h | 3 +++ src/config/SSSDConfigTest.py | 2 ++ src/config/etc/sssd.api.conf | 2 ++ src/man/include/homedir_substring.xml | 17 +++++++++++++++++ src/man/include/override_homedir.xml | 7 +++++++ src/man/po/po4a.cfg | 1 + src/man/sssd-ad.5.xml | 1 + src/man/sssd.conf.5.xml | 1 + src/providers/ipa/ipa_s2n_exop.c | 1 + src/providers/ipa/ipa_subdomains_id.c | 1 + src/responder/nss/nsssrv.c | 6 ++++++ src/responder/nss/nsssrv.h | 1 + src/responder/nss/nsssrv_cmd.c | 11 +++++++++-- src/util/domain_info_utils.c | 1 + src/util/sss_nss.c | 11 +++++++++++ src/util/sss_nss.h | 1 + 17 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 src/man/include/homedir_substring.xml diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c index 6f36535fdb27c0b987968cf440c1dccb63f250d9..15de9616ffdddf640f29e6b816c246ee05da48c7 100644 --- a/src/confdb/confdb.c +++ b/src/confdb/confdb.c @@ -1118,6 +1118,16 @@ static int confdb_get_domain_internal(struct confdb_ctx *cdb, } tmp = ldb_msg_find_attr_as_string(res->msgs[0], + CONFDB_NSS_HOMEDIR_SUBSTRING, NULL); + if (tmp != NULL) { + domain->homedir_substr = talloc_strdup(domain, tmp); + if (domain->homedir_substr == NULL) { + ret = ENOMEM; + goto done; + } + } + + tmp = ldb_msg_find_attr_as_string(res->msgs[0], CONFDB_NSS_OVERRIDE_SHELL, NULL); if (tmp != NULL) { domain->override_shell = talloc_strdup(domain, tmp); diff --git a/src/confdb/confdb.h b/src/confdb/confdb.h index 2cebf24262b73a9007a1104604a6e11a21065cd7..ba33ea5d7123c6e799f13529b60c5938ad20e411 100644 --- a/src/confdb/confdb.h +++ b/src/confdb/confdb.h @@ -97,6 +97,8 @@ #define CONFDB_NSS_SHELL_FALLBACK "shell_fallback" #define CONFDB_NSS_DEFAULT_SHELL "default_shell" #define CONFDB_MEMCACHE_TIMEOUT "memcache_timeout" +#define CONFDB_NSS_HOMEDIR_SUBSTRING "homedir_substring" +#define CONFDB_DEFAULT_HOMEDIR_SUBSTRING "/home" /* PAM */ #define CONFDB_PAM_CONF_ENTRY "config/pam" @@ -220,6 +222,7 @@ struct sss_domain_info { const char *override_homedir; const char *fallback_homedir; const char *subdomain_homedir; + const char *homedir_substr; const char *override_shell; const char *default_shell; diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index a3c25540d2a870eb02df51a416736736fde279d9..d4ed06ae85f23debb7a715eee5f338de8aad466c 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -522,6 +522,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'case_sensitive', 'override_homedir', 'fallback_homedir', + 'homedir_substring', 'override_shell', 'default_shell', 'pwd_expiration_warning', @@ -879,6 +880,7 @@ class SSSDConfigTestSSSDDomain(unittest.TestCase): 'case_sensitive', 'override_homedir', 'fallback_homedir', + 'homedir_substring', 'override_shell', 'default_shell', 'pwd_expiration_warning', diff --git a/src/config/etc/sssd.api.conf b/src/config/etc/sssd.api.conf index c7c1232c378d7e641da678d853247ddfd31bb736..5e5a9284e9ad80d822fe1db4269353aeb7925682 100644 --- a/src/config/etc/sssd.api.conf +++ b/src/config/etc/sssd.api.conf @@ -36,6 +36,7 @@ filter_users_in_groups = bool, None, false pwfield = str, None, false override_homedir = str, None, false fallback_homedir = str, None, false +homedir_substring = str, None, false, /home override_shell = str, None, false allowed_shells = list, str, false vetoed_shells = list, str, false @@ -118,6 +119,7 @@ override_gid = int, None, false case_sensitive = bool, None, false override_homedir = str, None, false fallback_homedir = str, None, false +homedir_substring = str, None, false override_shell = str, None, false default_shell = str, None, false description = str, None, false diff --git a/src/man/include/homedir_substring.xml b/src/man/include/homedir_substring.xml new file mode 100644 index 0000000000000000000000000000000000000000..d138c473e186f64a87e09ea09e9684091e571f3c --- /dev/null +++ b/src/man/include/homedir_substring.xml @@ -0,0 +1,17 @@ + + homedir_substring (string) + + + Value of this option will be used in the expansion of + override_homedir option if template contains + format string %H. LDAP directory can directly + contain template and this option can be used to expand home + directory for each machine (or Operating system). + It can be set in the [nss] section or per-domain. + The value from domain section has higher priority. + + + Default: /home + + + diff --git a/src/man/include/override_homedir.xml b/src/man/include/override_homedir.xml index 773d0b6616858ab5c0139033255bc60076857651..552d7eb9d3c8c4ec01cface4e062723ef9c29e1f 100644 --- a/src/man/include/override_homedir.xml +++ b/src/man/include/override_homedir.xml @@ -31,6 +31,13 @@ + %H + + The value of configure option + homedir_substring. + + + %% a literal '%' diff --git a/src/man/po/po4a.cfg b/src/man/po/po4a.cfg index 14b187345fd0526ac43986d2c203994f7a5476df..6e48c797968d3328e7e5f63166105a40f35a7c73 100644 --- a/src/man/po/po4a.cfg +++ b/src/man/po/po4a.cfg @@ -36,3 +36,4 @@ [type:docbook] include/ldap_search_bases.xml $lang:$(builddir)/$lang/include/ldap_search_bases.xml opt:"-k 0" [type:docbook] include/autofs_restart.xml $lang:$(builddir)/$lang/include/autofs_restart.xml opt:"-k 0" [type:docbook] include/override_homedir.xml $lang:$(builddir)/$lang/include/override_homedir.xml opt:"-k 0" +[type:docbook] include/homedir_substring.xml $lang:$(builddir)/$lang/include/homedir_substring.xml opt:"-k 0" diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml index 21f735e0a6c5c900723d82f13da30171f0ddeb9b..9070144ce4f478d20e93c8b7a4f732b56de98836 100644 --- a/src/man/sssd-ad.5.xml +++ b/src/man/sssd-ad.5.xml @@ -413,6 +413,7 @@ FOREST:EXAMPLE.COM:(memberOf=cn=admins,ou=groups,dc=example,dc=com) + krb5_use_enterprise_principal (boolean) diff --git a/src/man/sssd.conf.5.xml b/src/man/sssd.conf.5.xml index 6f63e3611ed59f5f393268c036f778c7b45a3e7b..951b6e9bb30b9393a24541580698bc7698e2d9af 100644 --- a/src/man/sssd.conf.5.xml +++ b/src/man/sssd.conf.5.xml @@ -513,6 +513,7 @@ + fallback_homedir (string) diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c index 02ba46dfb47e04481e63adeadb5c21cc33ed9b57..d60d651d059fa4d9b1c5e30f5789c3c403966fb3 100644 --- a/src/providers/ipa/ipa_s2n_exop.c +++ b/src/providers/ipa/ipa_s2n_exop.c @@ -748,6 +748,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) homedir_ctx->uid = attrs->a.user.pw_uid; homedir_ctx->domain = state->dom->name; homedir_ctx->flatname = state->dom->flat_name; + homedir_ctx->config_homedir_substr = state->dom->homedir_substr; homedir = expand_homedir_template(state, state->dom->subdomain_homedir, diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c index 818bf5f49c3dc4afe6beea12d3fcdd621795c3fc..123c54ef4b2cd3eb60c23bd2fc4686be8c742f0e 100644 --- a/src/providers/ipa/ipa_subdomains_id.c +++ b/src/providers/ipa/ipa_subdomains_id.c @@ -386,6 +386,7 @@ get_subdomain_homedir_of_user(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, homedir_ctx->uid = uid; homedir_ctx->domain = dom->name; homedir_ctx->flatname = dom->flat_name; + homedir_ctx->config_homedir_substr = dom->homedir_substr; ret = sss_parse_name_const(tmp_ctx, dom->names, fqname, NULL, &name); if (ret != EOK) { diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index e4896a79dc8a15554cdb1a7616d5353650eca209..1f762cca83083c911e2619263c7d89e267a34d61 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -291,6 +291,12 @@ static int nss_get_config(struct nss_ctx *nctx, &nctx->default_shell); if (ret != EOK) goto done; + ret = confdb_get_string(cdb, nctx, CONFDB_NSS_CONF_ENTRY, + CONFDB_NSS_HOMEDIR_SUBSTRING, + CONFDB_DEFAULT_HOMEDIR_SUBSTRING, + &nctx->homedir_substr); + if (ret != EOK) goto done; + ret = 0; done: return ret; diff --git a/src/responder/nss/nsssrv.h b/src/responder/nss/nsssrv.h index a36589837529a7b61768845eb3493197b13df8cd..a5b946b7e4a38d7d8b35ec5df1b6644d01896470 100644 --- a/src/responder/nss/nsssrv.h +++ b/src/responder/nss/nsssrv.h @@ -62,6 +62,7 @@ struct nss_ctx { char *override_homedir; char *fallback_homedir; + char *homedir_substr; char **allowed_shells; char *override_shell; char **vetoed_shells; diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c index 2d9b3ede31288305542519003568821e3e6d5447..9d09f1008ed1855f11f5f7f855686bb71a1afe87 100644 --- a/src/responder/nss/nsssrv_cmd.c +++ b/src/responder/nss/nsssrv_cmd.c @@ -190,6 +190,13 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx, return NULL; } + /* Check to see which homedir_prefix to use. */ + if (dom->homedir_substr != NULL) { + homedir_ctx->config_homedir_substr = dom->homedir_substr; + } else if (nctx->homedir_substr != NULL) { + homedir_ctx->config_homedir_substr = nctx->homedir_substr; + } + /* Check whether we are unconditionally overriding the server * for home directory locations. */ @@ -214,8 +221,8 @@ static const char *get_homedir_override(TALLOC_CTX *mem_ctx, } } - /* Return the value we got from the provider */ - return talloc_strdup(mem_ctx, homedir); + /* Provider can also return template, try to expand it.*/ + return expand_homedir_template(mem_ctx, homedir, homedir_ctx); } static const char *get_shell_override(TALLOC_CTX *mem_ctx, diff --git a/src/util/domain_info_utils.c b/src/util/domain_info_utils.c index fc428707612d97a313f020154c3d19efb8fbb2b1..a0fb7b2abe720e798817636b3810d36b7bbc0d93 100644 --- a/src/util/domain_info_utils.c +++ b/src/util/domain_info_utils.c @@ -281,6 +281,7 @@ struct sss_domain_info *new_subdomain(TALLOC_CTX *mem_ctx, dom->subdomain_homedir = parent->subdomain_homedir; dom->override_shell = parent->override_shell; dom->default_shell = parent->default_shell; + dom->homedir_substr = parent->homedir_substr; if (parent->sysdb == NULL) { DEBUG(SSSDBG_OP_FAILURE, "Missing sysdb context in parent domain.\n"); diff --git a/src/util/sss_nss.c b/src/util/sss_nss.c index 25a030c3f7f6d6cf6baff0ca9ad73f94b3cbae8e..8cc1416d714a2486e07fcc0c1c43f112428806c5 100644 --- a/src/util/sss_nss.c +++ b/src/util/sss_nss.c @@ -136,6 +136,17 @@ char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template, homedir_ctx->flatname); break; + case 'H': + if (homedir_ctx->config_homedir_substr == NULL) { + DEBUG(SSSDBG_CRIT_FAILURE, + "Cannot expand home directory substring template " + "substring is empty.\n"); + goto done; + } + result = talloc_asprintf_append(result, "%s%s", p, + homedir_ctx->config_homedir_substr); + break; + case '%': result = talloc_asprintf_append(result, "%s%%", p); break; diff --git a/src/util/sss_nss.h b/src/util/sss_nss.h index 771b9ce58db858f8cef8cac6ae3bf9fb382ef0d0..19bf26589a9a5d76369f56ef9ecf7bedbb29e07b 100644 --- a/src/util/sss_nss.h +++ b/src/util/sss_nss.h @@ -31,6 +31,7 @@ struct sss_nss_homedir_ctx { const char *original; const char *domain; const char *flatname; + const char *config_homedir_substr; }; char *expand_homedir_template(TALLOC_CTX *mem_ctx, const char *template, -- 1.9.3