[systemd-devel] [PATCH] shared: include root when canonicalizing conf paths

[Lennart Poettering]

On Fri, 31.01.14 15:35, Michael Marineau (michael.marineau at coreos.com) wrote:

Applied! Thanks!

> The conf_files_list family accepts an alternate root path to prefix all
> directories in the list but path_strv_canonicalize_uniq doesn't use it.
> This results in the suspicious behavior of resolving directory symlinks
> based on the contents of / instead of the alternate root.
> 
> This adds a prefix argument to path_strv_canonicalize which will now
> prepend the prefix, if given, to every path in the list. To avoid
> answering what a relative path means when called with a root prefix
> path_strv_canonicalize is now path_strv_canonicalize_absolute and only
> considers absolute paths. Fortunately all users of already call
> path_strv_canonicalize with a list of absolute paths.
> ---
> 
> Note: I'm posting this mostly just to point out this odd behavior since
> I couldn't decide if this patch really is the best way to fix it or not.
> So feedback welcome :)
> 
>  src/shared/conf-files.c  | 10 +++-------
>  src/shared/path-lookup.c |  6 +++---
>  src/shared/path-util.c   | 11 +++++++----
>  src/shared/path-util.h   |  4 ++--
>  src/shared/util.c        |  2 +-
>  5 files changed, 16 insertions(+), 17 deletions(-)
> 
> diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
> index c86bb03..5201782 100644
> --- a/src/shared/conf-files.c
> +++ b/src/shared/conf-files.c
> @@ -37,12 +37,8 @@
>  #include "hashmap.h"
>  #include "conf-files.h"
>  
> -static int files_add(Hashmap *h, const char *root, const char *path, const char *suffix) {
> +static int files_add(Hashmap *h, const char *dirpath, const char *suffix) {
>          _cleanup_closedir_ DIR *dir = NULL;
> -        _cleanup_free_ char *dirpath = NULL;
> -
> -        if (asprintf(&dirpath, "%s%s", root ? root : "", path) < 0)
> -                return -ENOMEM;
>  
>          dir = opendir(dirpath);
>          if (!dir) {
> @@ -104,7 +100,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
>          assert(suffix);
>  
>          /* This alters the dirs string array */
> -        if (!path_strv_canonicalize_uniq(dirs))
> +        if (!path_strv_canonicalize_absolute_uniq(dirs, root))
>                  return -ENOMEM;
>  
>          fh = hashmap_new(string_hash_func, string_compare_func);
> @@ -112,7 +108,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
>                  return -ENOMEM;
>  
>          STRV_FOREACH(p, dirs) {
> -                r = files_add(fh, root, *p, suffix);
> +                r = files_add(fh, *p, suffix);
>                  if (r == -ENOMEM) {
>                          hashmap_free_free(fh);
>                          return r;
> diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
> index e2ca942..63af43c 100644
> --- a/src/shared/path-lookup.c
> +++ b/src/shared/path-lookup.c
> @@ -275,7 +275,7 @@ int lookup_paths_init(
>                  }
>          }
>  
> -        if (!path_strv_canonicalize(p->unit_path))
> +        if (!path_strv_canonicalize_absolute(p->unit_path, NULL))
>                  return -ENOMEM;
>  
>          strv_uniq(p->unit_path);
> @@ -331,10 +331,10 @@ int lookup_paths_init(
>                                  return -ENOMEM;
>                  }
>  
> -                if (!path_strv_canonicalize(p->sysvinit_path))
> +                if (!path_strv_canonicalize_absolute(p->sysvinit_path, NULL))
>                          return -ENOMEM;
>  
> -                if (!path_strv_canonicalize(p->sysvrcnd_path))
> +                if (!path_strv_canonicalize_absolute(p->sysvrcnd_path, NULL))
>                          return -ENOMEM;
>  
>                  strv_uniq(p->sysvinit_path);
> diff --git a/src/shared/path-util.c b/src/shared/path-util.c
> index fc42a70..a0925e4 100644
> --- a/src/shared/path-util.c
> +++ b/src/shared/path-util.c
> @@ -153,7 +153,7 @@ char **path_strv_make_absolute_cwd(char **l) {
>          return l;
>  }
>  
> -char **path_strv_canonicalize(char **l) {
> +char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
>          char **s;
>          unsigned k = 0;
>          bool enomem = false;
> @@ -168,7 +168,10 @@ char **path_strv_canonicalize(char **l) {
>          STRV_FOREACH(s, l) {
>                  char *t, *u;
>  
> -                t = path_make_absolute_cwd(*s);
> +                if (!path_is_absolute(*s))
> +                        continue;
> +
> +                t = strjoin(prefix ? prefix : "", *s, NULL);
>                  free(*s);
>                  *s = NULL;
>  
> @@ -203,11 +206,11 @@ char **path_strv_canonicalize(char **l) {
>          return l;
>  }
>  
> -char **path_strv_canonicalize_uniq(char **l) {
> +char **path_strv_canonicalize_absolute_uniq(char **l, const char *prefix) {
>          if (strv_isempty(l))
>                  return l;
>  
> -        if (!path_strv_canonicalize(l))
> +        if (!path_strv_canonicalize_absolute(l, prefix))
>                  return NULL;
>  
>          return strv_uniq(l);
> diff --git a/src/shared/path-util.h b/src/shared/path-util.h
> index 178bed5..2b8ea02 100644
> --- a/src/shared/path-util.h
> +++ b/src/shared/path-util.h
> @@ -46,8 +46,8 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
>  bool path_equal(const char *a, const char *b) _pure_;
>  
>  char** path_strv_make_absolute_cwd(char **l);
> -char** path_strv_canonicalize(char **l);
> -char** path_strv_canonicalize_uniq(char **l);
> +char** path_strv_canonicalize_absolute(char **l, const char *prefix);
> +char** path_strv_canonicalize_absolute_uniq(char **l, const char *prefix);
>  
>  int path_is_mount_point(const char *path, bool allow_symlink);
>  int path_is_read_only_fs(const char *path);
> diff --git a/src/shared/util.c b/src/shared/util.c
> index aae5872..9cb71f9 100644
> --- a/src/shared/util.c
> +++ b/src/shared/util.c
> @@ -5610,7 +5610,7 @@ static int search_and_fopen_internal(const char *path, const char *mode, char **
>          assert(mode);
>          assert(_f);
>  
> -        if (!path_strv_canonicalize_uniq(search))
> +        if (!path_strv_canonicalize_absolute_uniq(search, NULL))
>                  return -ENOMEM;
>  
>          STRV_FOREACH(i, search) {


Lennart

-- 
Lennart Poettering, Red Hat