From: Nicolas Williams Date: Fri, 15 Jun 2018 12:45:38 +0000 (+0200) Subject: heimdal: Add include/includedir directives for krb5.conf X-Git-Tag: tevent-0.9.37~267 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a6e9b6c0e15fa6fe46acdd357d76b8df447317f;p=thirdparty%2Fsamba.git heimdal: Add include/includedir directives for krb5.conf Cherry-pick of Heimdal commit fe43be85587f834266623adb0ecf2793d212a7ca Removed tests and documentation from original commit by Björn Baumbach , since we do not ship them. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11573 Signed-off-by: Björn Baumbach Reviewed-by: Alexander Bokovoy Autobuild-User(master): Björn Baumbach Autobuild-Date(master): Mon Jun 18 15:52:26 CEST 2018 on sn-devel-144 --- diff --git a/source4/heimdal/lib/krb5/config_file.c b/source4/heimdal/lib/krb5/config_file.c index a505b63519b..05f97eb6d1d 100644 --- a/source4/heimdal/lib/krb5/config_file.c +++ b/source4/heimdal/lib/krb5/config_file.c @@ -41,6 +41,7 @@ /* Gaah! I want a portable funopen */ struct fileptr { + krb5_context context; const char *s; FILE *f; }; @@ -363,7 +364,7 @@ krb5_config_parse_debug (struct fileptr *f, ++p; if (*p == '#' || *p == ';') continue; - if (*p == '[') { + if (*p == '[') { ret = parse_section(p, &s, res, err_message); if (ret) return ret; @@ -371,6 +372,22 @@ krb5_config_parse_debug (struct fileptr *f, } else if (*p == '}') { *err_message = "unmatched }"; return KRB5_CONFIG_BADFORMAT; + } else if (strncmp(p, "include", sizeof("include") - 1) == 0 && + isspace(p[sizeof("include") - 1])) { + p += sizeof("include"); + while (isspace(*p)) + p++; + ret = krb5_config_parse_file_multi(f->context, p, res); + if (ret) + return ret; + } else if (strncmp(p, "includedir", sizeof("includedir") - 1) == 0 && + isspace(p[sizeof("includedir") - 1])) { + p += sizeof("includedir"); + while (isspace(*p)) + p++; + ret = krb5_config_parse_dir_multi(f->context, p, res); + if (ret) + return ret; } else if(*p != '\0') { if (s == NULL) { *err_message = "binding before section"; @@ -396,6 +413,64 @@ is_plist_file(const char *fname) return 1; } +/** + * Parse configuration files in the given directory and add the result + * into res. Only files whose names consist only of alphanumeric + * characters, hyphen, and underscore, will be parsed, though files + * ending in ".conf" will also be parsed. + * + * This interface can be used to parse several configuration directories + * into one resulting krb5_config_section by calling it repeatably. + * + * @param context a Kerberos 5 context. + * @param dname a directory name to a Kerberos configuration file + * @param res the returned result, must be free with krb5_free_config_files(). + * @return Return an error code or 0, see krb5_get_error_message(). + * + * @ingroup krb5_support + */ + +KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL +krb5_config_parse_dir_multi(krb5_context context, + const char *dname, + krb5_config_section **res) +{ + struct dirent *entry; + krb5_error_code ret; + DIR *d; + + if ((d = opendir(dname)) == NULL) + return errno; + + while ((entry = readdir(d)) != NULL) { + char *p = entry->d_name; + char *path; + int is_valid = 1; + + while (*p) { + if (!isalpha(*p) && *p != '_' && *p != '-' && + strcmp(p, ".conf") != 0) { + is_valid = 0; + break; + } + p++; + } + if (!is_valid) + continue; + + if (asprintf(&path, "%s/%s", dname, entry->d_name) == -1 || + path == NULL) + return krb5_enomem(context); + ret = krb5_config_parse_file_multi(context, path, res); + free(path); + if (ret == ENOMEM) + return krb5_enomem(context);; + /* Ignore malformed config files */ + } + (void) closedir(d); + return 0; +} + /** * Parse a configuration file and add the result into res. This * interface can be used to parse several configuration files into one @@ -420,6 +495,13 @@ krb5_config_parse_file_multi (krb5_context context, krb5_error_code ret; struct fileptr f; + if (context->config_include_depth > 5) { + krb5_warnx(context, "Maximum config file include depth reached; " + "not including %s", fname); + return 0; + } + context->config_include_depth++; + /** * If the fname starts with "~/" parse configuration file in the * current users home directory. The behavior can be disabled and @@ -430,6 +512,7 @@ krb5_config_parse_file_multi (krb5_context context, const char *home = NULL; if (!_krb5_homedir_access(context)) { + context->config_include_depth--; krb5_set_error_message(context, EPERM, "Access to home directory not allowed"); return EPERM; @@ -447,14 +530,18 @@ krb5_config_parse_file_multi (krb5_context context, int aret; aret = asprintf(&newfname, "%s%s", home, &fname[1]); - if (aret == -1 || newfname == NULL) + if (aret == -1 || newfname == NULL) { + context->config_include_depth--; return krb5_enomem(context); + } fname = newfname; } #else /* KRB5_USE_PATH_TOKENS */ if (asprintf(&newfname, "%%{USERCONFIG}%s", &fname[1]) < 0 || - newfname == NULL) + newfname == NULL) { + context->config_include_depth--; return krb5_enomem(context); + } fname = newfname; #endif } @@ -462,6 +549,7 @@ krb5_config_parse_file_multi (krb5_context context, if (is_plist_file(fname)) { #ifdef __APPLE__ ret = parse_plist_config(context, fname, res); + context->config_include_depth--; if (ret) { krb5_set_error_message(context, ret, "Failed to parse plist %s", fname); @@ -480,6 +568,7 @@ krb5_config_parse_file_multi (krb5_context context, ret = _krb5_expand_path_tokens(context, fname, &exp_fname); if (ret) { + context->config_include_depth--; if (newfname) free(newfname); return ret; @@ -490,9 +579,11 @@ krb5_config_parse_file_multi (krb5_context context, fname = newfname = exp_fname; #endif + f.context = context; f.f = fopen(fname, "r"); f.s = NULL; if(f.f == NULL) { + context->config_include_depth--; ret = errno; krb5_set_error_message (context, ret, "open %s: %s", fname, strerror(ret)); @@ -502,6 +593,7 @@ krb5_config_parse_file_multi (krb5_context context, } ret = krb5_config_parse_debug (&f, res, &lineno, &str); + context->config_include_depth--; fclose(f.f); if (ret) { krb5_set_error_message (context, ret, "%s:%u: %s", @@ -1305,6 +1397,8 @@ krb5_config_parse_string_multi(krb5_context context, unsigned lineno = 0; krb5_error_code ret; struct fileptr f; + + f.context = context; f.f = NULL; f.s = string; diff --git a/source4/heimdal/lib/krb5/krb5_locl.h b/source4/heimdal/lib/krb5/krb5_locl.h index 49c614d5efe..f9c40e36390 100644 --- a/source4/heimdal/lib/krb5/krb5_locl.h +++ b/source4/heimdal/lib/krb5/krb5_locl.h @@ -262,6 +262,7 @@ typedef struct krb5_context_data { int32_t kdc_sec_offset; int32_t kdc_usec_offset; krb5_config_section *cf; + size_t config_include_depth; struct et_list *et_list; struct krb5_log_facility *warn_dest; struct krb5_log_facility *debug_dest;