From 47d7ab727cf5bd0697b17854a948971101b4e725 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Jan 2020 21:56:10 +0100
Subject: [PATCH 1479/1760] fs-util: make sure we output normalized paths in
 chase_symlinks()

Let's eat up multiple slashes.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1787089
Replaces: #14687
Reference: https://github.com/systemd/systemd/commit/47d7ab727cf5bd0697b17854a948971101b4e725
Conflict: NA
---
 src/basic/fs-util.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 2e74917..6b14abd 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -787,6 +787,14 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                 if (r < 0)
                         return r;
 
+                /* Simplify the root directory, so that it has no duplicate slashes and nothing at the
+                 * end. While we won't resolve the root path we still simplify it. Note that dropping the
+                 * trailing slash should not change behaviour, since when opening it we specify O_DIRECTORY
+                 * anyway. Moreover at the end of this function after processing everything we'll always turn
+                 * the empty string back to "/". */
+                delete_trailing_chars(root, "/");
+                path_simplify(root, true);
+
                 if (flags & CHASE_PREFIX_ROOT) {
 
                         /* We don't support relative paths in combination with a root directory */
@@ -823,11 +831,9 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                                               "Specified path '%s' is outside of specified root directory '%s', refusing to resolve.",
                                               path, root);
 
-                /* Make sure "done" ends without a slash */
                 done = strdup(root);
                 if (!done)
                         return -ENOMEM;
-                delete_trailing_chars(done, "/");
 
                 /* Make sure "todo" starts with a slash */
                 absolute = strjoin("/", e);
@@ -846,6 +852,15 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
 
                 /* Determine length of first component in the path */
                 n = strspn(todo, "/");                  /* The slashes */
+
+                if (n > 1) {
+                        /* If we are looking at more than a single slash then skip all but one, so that when
+                         * we are done with everything we have a normalized path with only single slashes
+                         * separating the path components. */
+                        todo += n - 1;
+                        n = 1;
+                }
+
                 m = n + strcspn(todo + n, "/");         /* The entire length of the component */
 
                 /* Extract the first component. */
@@ -1002,8 +1017,6 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags,
                                         done = strdup(root);
                                         if (!done)
                                                 return -ENOMEM;
-
-                                        delete_trailing_chars(done, "/");
                                 }
 
                                 /* Prefix what's left to do with what we just read, and start the loop again, but
-- 
2.23.0

