fix: change user for every mkdir command (fixes #729)

Author: actionless

pikaur/build.py

@@ -22,6 +22,7 @@
     dirname,
     interactive_spawn,
     joined_spawn,
+    mkdir,
     open_file,
     remove_dir,
     replace_file,
@@ -80,7 +81,7 @@ def _shell(cmds: list[str]) -> "InteractiveSpawn":
     return interactive_spawn(isolate_root_cmd(wrap_proxy_env(cmds)))
 
 
-def _mkdir(to_path: Path) -> None:
+def isolated_mkdir(to_path: Path) -> None:
     mkdir_result = spawn(isolate_root_cmd(["mkdir", "-p", str(to_path)]))
     if mkdir_result.returncode != 0:
         print_stdout(mkdir_result.stdout_text)
@@ -92,7 +93,7 @@ def copy_aur_repo(from_path: Path, to_path: Path) -> None:
     from_path = from_path.resolve()
     to_path = to_path.resolve()
     if not to_path.exists():
-        _mkdir(to_path)
+        isolated_mkdir(to_path)
 
     from_paths = []
     for src_path_str in glob(f"{from_path}/*") + glob(f"{from_path}/.*"):
@@ -107,7 +108,7 @@ def copy_aur_repo(from_path: Path, to_path: Path) -> None:
     if result.returncode != 0:
         if to_path.exists():
             remove_dir(to_path)
-            _mkdir(to_path)
+            isolated_mkdir(to_path)
         result = interactive_spawn(cmd_args)
         if result.returncode != 0:
             raise RuntimeError(translate(f"Can't copy '{from_path}' to '{to_path}'."))
@@ -201,7 +202,7 @@ def __init__(  # pylint: disable=super-init-not-called
             else:
                 self.clone = True
         else:
-            self.repo_path.mkdir(parents=True)
+            isolated_mkdir(self.repo_path)
             self.clone = True
 
         self.reviewed = self.current_hash == self.last_installed_hash
@@ -482,8 +483,7 @@ def _set_built_package_path(self) -> None:
                 new_package_sig_path = new_package_path.parent / (
                     new_package_path.name + ".sig"
                 )
-                if not PACKAGE_CACHE_PATH.exists():
-                    PACKAGE_CACHE_PATH.mkdir(parents=True)
+                mkdir(PACKAGE_CACHE_PATH)
                 replace_file(pkg_path, new_package_path)
                 replace_file(pkg_sig_path, new_package_sig_path)
             pkg_path = new_package_path

pikaur/config.py

@@ -368,8 +368,8 @@ def write_config(config: configparser.ConfigParser | None = None) -> None:
                 config[section_name][option_name] = option_schema["default"]
                 need_write = True
     if need_write:
-        if not CONFIG_ROOT.exists():
-            CONFIG_ROOT.mkdir(parents=True)
+        from .core import mkdir  # pylint: disable=import-outside-toplevel
+        mkdir(CONFIG_ROOT)
         with get_config_path().open("w", encoding=DEFAULT_CONFIG_ENCODING) as configfile:
             config.write(configfile)
 

pikaur/core.py

@@ -393,3 +393,14 @@ def check_runtime_deps(dep_names: list[str] | None = None) -> None:
                 translate("executable not found"),
             ))
             sys.exit(2)
+
+
+def mkdir(path: Path) -> None:
+    if not path.exists():
+        path.mkdir(parents=True)
+        args = parse_args()
+        user_id = args.user_id
+        if not isinstance(user_id, int):
+            raise TypeError
+        if user_id:
+            os.chown(path, user_id, user_id)

pikaur/main.py

@@ -29,6 +29,7 @@
     DEFAULT_INPUT_ENCODING,
     check_runtime_deps,
     interactive_spawn,
+    mkdir,
     spawn,
     sudo,
 )
@@ -351,8 +352,7 @@ def migrate_old_aur_repos_dir() -> None:
             _OLD_AUR_REPOS_CACHE_PATH.exists() and not AUR_REPOS_CACHE_PATH.exists()
     ):
         return
-    if not DATA_ROOT.exists():
-        DATA_ROOT.mkdir(parents=True)
+    mkdir(DATA_ROOT)
     shutil.move(_OLD_AUR_REPOS_CACHE_PATH, AUR_REPOS_CACHE_PATH)
 
     print_stderr()
@@ -377,13 +377,10 @@ def create_dirs() -> None:
         # Chown the private CacheDirectory to root to signal systemd that
         # it needs to recursively chown it to the correct user
         os.chown(os.path.realpath(CACHE_ROOT), 0, 0)
-        if not _USER_CACHE_ROOT.exists():
-            _USER_CACHE_ROOT.mkdir(parents=True)
-    if not CACHE_ROOT.exists():
-        CACHE_ROOT.mkdir(parents=True)
+        mkdir(_USER_CACHE_ROOT)
+    mkdir(CACHE_ROOT)
     migrate_old_aur_repos_dir()
-    if not AUR_REPOS_CACHE_PATH.exists():
-        AUR_REPOS_CACHE_PATH.mkdir(parents=True)
+    mkdir(AUR_REPOS_CACHE_PATH)
 
 
 def restore_tty() -> None: