From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 21 Feb 2022 14:54:31 +0000 (+0000)
Subject: Don't override stat of destination root when using copy_path()
X-Git-Tag: v13~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F911%2Fhead;p=thirdparty%2Fmkosi.git

Don't override stat of destination root when using copy_path()

Fixes unexpected scenarios where we modify the permissions of / when
using mkosi.extra/. See https://github.com/systemd/systemd/pull/22569#issuecomment-1045992142
for more information.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index ff957161f..4ace4c913 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -628,7 +628,7 @@ def symlink_f(target: str, path: Path) -> None:
         path.symlink_to(target)
 
 
-def copy_path(oldpath: PathString, newpath: Path) -> None:
+def copy_path(oldpath: PathString, newpath: Path, *, copystat: bool = True) -> None:
     try:
         newpath.mkdir(exist_ok=True)
     except FileExistsError:
@@ -651,7 +651,9 @@ def copy_path(oldpath: PathString, newpath: Path) -> None:
             else:
                 print("Ignoring", entry.path)
                 continue
-    shutil.copystat(oldpath, newpath, follow_symlinks=True)
+
+    if copystat:
+        shutil.copystat(oldpath, newpath, follow_symlinks=True)
 
 
 @complete_step("Detaching namespace")
@@ -3630,7 +3632,7 @@ def install_extra_trees(args: MkosiArgs, root: Path, for_cache: bool) -> None:
     with complete_step("Copying in extra file trees…"):
         for tree in args.extra_trees:
             if tree.is_dir():
-                copy_path(tree, root)
+                copy_path(tree, root, copystat=False)
             else:
                 # unpack_archive() groks Paths, but mypy doesn't know this.
                 # Pretend that tree is a str.
@@ -3650,7 +3652,7 @@ def install_skeleton_trees(args: MkosiArgs, root: Path, cached: bool, *, late: b
     with complete_step("Copying in skeleton file trees…"):
         for tree in args.skeleton_trees:
             if tree.is_dir():
-                copy_path(tree, root)
+                copy_path(tree, root, copystat=False)
             else:
                 # unpack_archive() groks Paths, but mypy doesn't know this.
                 # Pretend that tree is a str.
@@ -3764,7 +3766,7 @@ def install_build_dest(args: MkosiArgs, root: Path, do_run_build_script: bool, f
         return
 
     with complete_step("Copying in build tree…"):
-        copy_path(install_dir(args, root), root)
+        copy_path(install_dir(args, root), root, copystat=False)
 
 
 def make_read_only(args: MkosiArgs, root: Path, for_cache: bool, b: bool = True) -> None:
@@ -7159,7 +7161,7 @@ def reuse_cache_tree(
 
     if fname.exists():
         with complete_step(f"Copying in cached tree {fname}…"):
-            copy_path(fname, root)
+            copy_path(fname, root, copystat=False)
 
     return True