Merge pull request #24744 from yuwata/mkdir-chase-symlinks

mkdir: chase_symlinks_and_stat() does not return 0
This commit is contained in:
Yu Watanabe
2022-09-20 01:43:00 +09:00
committed by GitHub
2 changed files with 102 additions and 7 deletions

View File

@@ -19,7 +19,8 @@
int mkdir_safe_internal(
const char *path,
mode_t mode,
uid_t uid, gid_t gid,
uid_t uid,
gid_t gid,
MkdirFlags flags,
mkdirat_func_t _mkdirat) {
@@ -42,13 +43,16 @@ int mkdir_safe_internal(
if ((flags & MKDIR_FOLLOW_SYMLINK) && S_ISLNK(st.st_mode)) {
_cleanup_free_ char *p = NULL;
r = chase_symlinks_and_stat(path, NULL, 0, &p, &st, NULL);
r = chase_symlinks(path, NULL, CHASE_NONEXISTENT, &p, NULL);
if (r < 0)
return r;
if (r == 0)
return mkdir_safe_internal(p, mode, uid, gid,
flags & ~MKDIR_FOLLOW_SYMLINK,
_mkdirat);
if (lstat(p, &st) < 0)
return -errno;
}
if (flags & MKDIR_IGNORE_EXISTING)

View File

@@ -2,29 +2,120 @@
#include <unistd.h>
#include "fs-util.h"
#include "mkdir.h"
#include "path-util.h"
#include "rm-rf.h"
#include "stat-util.h"
#include "tests.h"
#include "tmpfile-util.h"
#include "user-util.h"
TEST(mkdir_p) {
TEST(mkdir_p_safe) {
_cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
_cleanup_free_ char *p = NULL, *q = NULL;
assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
assert_se(p = path_join(tmp, "run/aaa/bbb"));
assert_se(mkdir_p(p, 0755) >= 0);
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "run/ccc/ddd"));
assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "var/run"));
assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
assert_se(symlink("../run", p) >= 0);
assert_se(is_dir(p, false) == 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
assert_se(mkdir_p_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "not-exists"));
assert_se(q = path_join(p, "aaa"));
assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOENT);
p = mfree(p);
q = mfree(q);
assert_se(p = path_join(tmp, "regular-file"));
assert_se(q = path_join(p, "aaa"));
assert_se(touch(p) >= 0);
assert_se(mkdir_p_safe(p, q, 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
p = mfree(p);
q = mfree(q);
assert_se(p = path_join(tmp, "symlink"));
assert_se(q = path_join(p, "hoge/foo"));
assert_se(symlink("aaa", p) >= 0);
assert_se(mkdir_p_safe(tmp, q, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
assert_se(is_dir(q, false) > 0);
assert_se(is_dir(q, true) > 0);
q = mfree(q);
assert_se(q = path_join(tmp, "aaa/hoge/foo"));
assert_se(is_dir(q, false) > 0);
assert_se(is_dir(q, true) > 0);
assert_se(mkdir_p_safe(tmp, "/tmp/test-mkdir-outside", 0755, UID_INVALID, GID_INVALID, 0) == -ENOTDIR);
}
TEST(mkdir_p_root) {
_cleanup_(rm_rf_physical_and_freep) char *tmp = NULL;
_cleanup_free_ char *p = NULL;
assert_se(mkdtemp_malloc("/tmp/test-mkdir-XXXXXX", &tmp) >= 0);
assert_se(p = path_join(tmp, "run"));
assert_se(mkdir_p(p, 0755) >= 0);
assert_se(p = path_join(tmp, "run/aaa/bbb"));
assert_se(mkdir_p_root(tmp, "/run/aaa/bbb", UID_INVALID, GID_INVALID, 0755) >= 0);
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "var/run"));
assert_se(mkdir_parents(p, 0755) >= 0);
assert_se(mkdir_parents_safe(tmp, p, 0755, UID_INVALID, GID_INVALID, 0) >= 0);
assert_se(symlink("../run", p) >= 0);
assert_se(is_dir(p, false) == 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "var/run/hoge/foo/baz"));
assert_se(mkdir_p(p, 0755) >= 0);
assert_se(mkdir_p_root(tmp, "/var/run/hoge/foo/baz", UID_INVALID, GID_INVALID, 0755) >= 0);
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "not-exists"));
assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOENT);
p = mfree(p);
assert_se(p = path_join(tmp, "regular-file"));
assert_se(touch(p) >= 0);
assert_se(mkdir_p_root(p, "/aaa", UID_INVALID, GID_INVALID, 0755) == -ENOTDIR);
/* FIXME: The tests below do not work.
p = mfree(p);
assert_se(p = path_join(tmp, "symlink"));
assert_se(symlink("aaa", p) >= 0);
assert_se(mkdir_p_root(tmp, "/symlink/hoge/foo", UID_INVALID, GID_INVALID, 0755) >= 0);
p = mfree(p);
assert_se(p = path_join(tmp, "symlink/hoge/foo"));
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
p = mfree(p);
assert_se(p = path_join(tmp, "aaa/hoge/foo"));
assert_se(is_dir(p, false) > 0);
assert_se(is_dir(p, true) > 0);
*/
}
DEFINE_TEST_MAIN(LOG_DEBUG);