oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

base: Fix use of HEIM_USE_PATH_TOKENS

Browse Source
This commit is contained in:
Nicolas Williams
2020-05-25 14:43:05 -05:00
parent 16482c4a68
commit 4c34168b01
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/base/baselocl.h
View File

@@ -40,7 +40,6 @@
#define ISTILDE(x) (x == '~') #define ISTILDE(x) (x == '~')
#ifdef _WIN32 #ifdef _WIN32
# define ISPATHSEP(x) (x == '/' || x =='\\') # define ISPATHSEP(x) (x == '/' || x =='\\')
# define HEIM_BASE_USE_PATH_TOKENS 1
#else #else
# define ISPATHSEP(x) (x == '/') # define ISPATHSEP(x) (x == '/')
#endif #endif

33
lib/base/config_file.c
View File

@@ -575,40 +575,18 @@ heim_config_parse_file_multi(heim_context context,
* enabled by calling heim_set_home_dir_access(). * enabled by calling heim_set_home_dir_access().
*/ */
if (ISTILDE(fname[0]) && ISPATHSEP(fname[1])) { if (ISTILDE(fname[0]) && ISPATHSEP(fname[1])) {
#ifndef HEIM_BASE_USE_PATH_TOKENS
const char *home = NULL;
char homebuf[MAX_PATH];
if (!heim_context_get_homedir_access(context)) { if (!heim_context_get_homedir_access(context)) {
heim_set_error_message(context, EPERM, heim_set_error_message(context, EPERM,
"Access to home directory not allowed"); "Access to home directory not allowed");
ret = EPERM; ret = EPERM;
goto out; goto out;
} }
home = roken_get_appdatadir(homebuf, sizeof(homebuf));
if (home) {
int aret;
aret = asprintf(&newfname, "%s%s", home, &fname[1]);
if (aret == -1 || newfname == NULL) {
ret = heim_enomem(context);
goto out;
}
fname = newfname;
}
#else /* HEIM_BASE_USE_PATH_TOKENS */
/*
* Really, this is Windows, and on Windows we'd want to allow homedir
* access. We could refactor this a bit though.
*/
if (asprintf(&newfname, "%%{USERCONFIG}%s", &fname[1]) < 0 || if (asprintf(&newfname, "%%{USERCONFIG}%s", &fname[1]) < 0 ||
newfname == NULL) { newfname == NULL) {
ret = heim_enomem(context); ret = heim_enomem(context);
goto out; goto out;
} }
fname = newfname; fname = newfname;
#endif /* HEIM_BASE_USE_PATH_TOKENS */
} }
if (is_plist_file(fname)) { if (is_plist_file(fname)) {
@@ -626,14 +604,19 @@ heim_config_parse_file_multi(heim_context context,
goto out; goto out;
#endif #endif
} else { } else {
#ifdef HEIM_BASE_USE_PATH_TOKENS char *exp_fname = NULL;
char *exp_fname; /* newfname might be non-NULL */
/*
* Note that heim_config_parse_dir_multi() doesn't want tokens
* expanded here, but it happens to limit the names of files to
* include such that there can be no tokens to expand. Don't
* add token expansion for tokens using _, say.
*/
ret = heim_expand_path_tokens(context, fname, 1, &exp_fname, NULL); ret = heim_expand_path_tokens(context, fname, 1, &exp_fname, NULL);
if (ret) if (ret)
goto out; goto out;
free(newfname); free(newfname);
fname = newfname = exp_fname; fname = newfname = exp_fname;
#endif /* HEIM_BASE_USE_PATH_TOKENS */
f.context = context; f.context = context;
f.f = fopen(fname, "r"); f.f = fopen(fname, "r");