dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

basic/path-util: make path_simplify() skip leading '/..'

Browse Source 
I.e., /.. becomes /, /../foo becomes /foo, /../../bar becomes /bar, etc. We can
do this unconditionally, without access to the file system, because the parent
of the root directory always resolves to. /.. in other places is handled as
before, because resolving it properly would require access to the file system
which we don't want to do in path_simplify().
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-09-21 16:52:54 +02:00
parent a410b3a3d4
commit 003ccba650
2 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/path-util.c
View File

@@ -345,7 +345,7 @@ char** path_strv_resolve_uniq(char **l, const char *root) {
}
char* path_simplify_full(char *path, PathSimplifyFlags flags) {
bool add_slash = false, keep_trailing_slash;
bool add_slash = false, keep_trailing_slash, absolute, beginning = true;
char *f = ASSERT_PTR(path);
int r;
@@ -354,6 +354,8 @@ char* path_simplify_full(char *path, PathSimplifyFlags flags) {
*
* ///foo//./bar/. becomes /foo/bar
* .//./foo//./bar/. becomes foo/bar
* /../foo/bar becomes /foo/bar
* /../foo/bar/.. becomes /foo/bar/..
*/
if (isempty(path))
@@ -361,8 +363,8 @@ char* path_simplify_full(char *path, PathSimplifyFlags flags) {
keep_trailing_slash = FLAGS_SET(flags, PATH_SIMPLIFY_KEEP_TRAILING_SLASH) && endswith(path, "/");
if (path_is_absolute(path))
f++;
absolute = path_is_absolute(path);
f += absolute; /* Keep leading /, if present. */
for (const char *p = f;;) {
const char *e;
@@ -371,11 +373,17 @@ char* path_simplify_full(char *path, PathSimplifyFlags flags) {
if (r == 0)
break;
if (r > 0 && absolute && beginning && path_startswith(e, ".."))
/* If we're at the beginning of an absolute path, we can safely skip ".." */
continue;
beginning = false;
if (add_slash)
*f++ = '/';
if (r < 0) {
/* if path is invalid, then refuse to simplify remaining part. */
/* if path is invalid, then refuse to simplify the remaining part. */
memmove(f, p, strlen(p) + 1);
return path;
}

42
src/test/test-path-util.c
View File

@@ -158,7 +158,7 @@ TEST(path_simplify) {
test_path_simplify_one("///", "/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("///.//", "/", 0);
test_path_simplify_one("///.//.///", "/", 0);
test_path_simplify_one("////.././///../.", "/../..", 0);
test_path_simplify_one("////.././///../.", "/", 0);
test_path_simplify_one(".", ".", 0);
test_path_simplify_one("./", ".", 0);
test_path_simplify_one("./", "./", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
@@ -174,6 +174,46 @@ TEST(path_simplify) {
"../aaa/.bbb/../c./d.dd/..eeee/..", 0);
test_path_simplify_one("abc///", "abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc///", "/abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc///", "/abc", 0);
test_path_simplify_one("/../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc///..", "/abc/..", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc///../", "/abc/../", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../abc///../", "/abc/..", 0);
test_path_simplify_one("/../../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../../abc///", "/abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../../abc///", "/abc", 0);
test_path_simplify_one("/../../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../../abc///../..", "/abc/../..", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../../abc///../../", "/abc/../../", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/../../abc///../../", "/abc/../..", 0);
test_path_simplify_one("/.././../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.././../abc///", "/abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.././../abc///", "/abc", 0);
test_path_simplify_one("/.././../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.././../abc///../..", "/abc/../..", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.././../abc///../../", "/abc/../../", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.././../abc///../../", "/abc/../..", 0);
test_path_simplify_one("/./.././../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/./.././../abc///", "/abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/./.././../abc///", "/abc", 0);
test_path_simplify_one("/./.././../abc", "/abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/./.././../abc///../..", "/abc/../..", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/./.././../abc///../../", "/abc/../../", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/./.././../abc///../../", "/abc/../..", 0);
test_path_simplify_one("/.../abc", "/.../abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.../abc///", "/.../abc/", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.../abc///", "/.../abc", 0);
test_path_simplify_one("/.../abc", "/.../abc", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.../abc///...", "/.../abc/...", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.../abc///.../", "/.../abc/.../", PATH_SIMPLIFY_KEEP_TRAILING_SLASH);
test_path_simplify_one("/.../abc///.../", "/.../abc/...", 0);
memset(foo, 'a', sizeof(foo) -1);
char_array_0(foo);