SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-copy: cover DENY_CONTENTS directory exclusion

Browse Source 
Exercise the early "goto finish" path in fd_copy_directory() by putting
a directory's inode in the denylist as DENY_CONTENTS, and assert the
directory is created in the destination but its contents are not copied.
This path previously had no coverage.

Co-developed-by: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Paul Meyer <katexochen0@gmail.com>
This commit is contained in:
Paul Meyer
2026-06-07 13:41:18 +02:00
parent 2a72c69c37
commit 12a5174500
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-copy.c
+16 -1
View File
@@ -141,7 +141,7 @@ TEST(copy_tree) {
"link2", "dir1/file");
char **hardlinks = STRV_MAKE("hlink", "file",
"hlink2", "dir1/file");
const char *unixsockp, *ignorep;
const char *unixsockp, *ignorep, *denydirp, *denyfilep;
struct stat st;
int xattr_worked = -1; /* xattr support is optional in temporary directories, hence use it if we can,
* but don't fail if we can't */
@@ -194,6 +194,14 @@ TEST(copy_tree) {
assert_se(hashmap_ensure_put(&denylist, &inode_hash_ops, cp, INT_TO_PTR(DENY_INODE)) >= 0);
TAKE_PTR(cp);
denyfilep = strjoina(original_dir, "denycontents/file");
assert_se(write_string_file(denyfilep, "denied", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_MKDIR_0755) == 0);
denydirp = strjoina(original_dir, "denycontents");
assert_se(RET_NERRNO(stat(denydirp, &st)) >= 0);
assert_se(cp = memdup(&st, sizeof(st)));
assert_se(hashmap_ensure_put(&denylist, &inode_hash_ops, cp, INT_TO_PTR(DENY_CONTENTS)) >= 0);
TAKE_PTR(cp);
assert_se(copy_tree(original_dir, copy_dir, UID_INVALID, GID_INVALID, COPY_REFLINK|COPY_MERGE|COPY_HARDLINKS, denylist, NULL) == 0);
STRV_FOREACH(p, files) {
@@ -252,6 +260,13 @@ TEST(copy_tree) {
ignorep = strjoina(copy_dir, "ignore/file");
assert_se(RET_NERRNO(access(ignorep, F_OK)) == -ENOENT);
/* The DENY_CONTENTS directory itself must exist in the copy, but its contents must not have been copied. */
denydirp = strjoina(copy_dir, "denycontents");
assert_se(stat(denydirp, &st) >= 0);
assert_se(S_ISDIR(st.st_mode));
denyfilep = strjoina(copy_dir, "denycontents/file");
assert_se(RET_NERRNO(access(denyfilep, F_OK)) == -ENOENT);
(void) rm_rf(copy_dir, REMOVE_ROOT|REMOVE_PHYSICAL);
(void) rm_rf(original_dir, REMOVE_ROOT|REMOVE_PHYSICAL);
}