fix/feat(privilege,args,config,os_utils,main,readme): add --group-id/misc.GroupId and use it automatically where needed (Fixes: #863)

Author: actionless

README.md

@@ -235,7 +235,12 @@ In case of elevating privilege for pacman - pikaur would ask for password every
 User ID to run makepkg if pikaur started from root.
 0 - means disabled, not that it will use uid=0.
 Setting this option would override DynamicUsers settings and force changing to this UID instead of a dynamic one.
+The config value would be overriden by `--user-id` flag.
 
+##### GroupId (default: 0)
+Group ID to run makepkg if pikaur started from root.
+0 - means disabled, not that it will use gid=0.
+The config value would be overriden by `--group-id` flag.
 
 ##### CachePath (default: ~/.cache)
 Path to package cache location.

pikaur/args.py

@@ -380,6 +380,10 @@ def get_pikaur_int_opts(action: str | None = None) -> ArgSchema:
                 None, "user-id", PikaurConfig().misc.UserId.get_int(),
                 translate("user ID to run makepkg if pikaur started from root"),
             ),
+            Arg(
+                None, "group-id", PikaurConfig().misc.GroupId.get_int(),
+                translate("group ID to run makepkg if pikaur started from root"),
+            ),
         ]
     if action == "extras":
         result += [

pikaur/config.py

@@ -129,14 +129,23 @@ def pre_arg_parser(key: str, fallback: str) -> str:
     return fallback
 
 
-class CustomUserId(IntOrBoolSingleton):
+class IntOrBoolSingletonUpdateableFallback(IntOrBoolSingleton):
+
+    @classmethod
+    def update_fallback(cls, new_id: int) -> None:
+        cls.set_value(cls() or new_id)
+
+
+class CustomUserId(IntOrBoolSingletonUpdateableFallback):
     @classmethod
     def init_value(cls) -> int:
         return int(pre_arg_parser("--user-id", "0"))
 
+
+class CustomGroupId(IntOrBoolSingletonUpdateableFallback):
     @classmethod
-    def update_fallback(cls, new_id: int) -> None:
-        cls.set_value(cls() or new_id)
+    def init_value(cls) -> int:
+        return int(pre_arg_parser("--group-id", "0"))
 
 
 class RunningAsRoot(IntOrBoolSingleton):
@@ -380,7 +389,7 @@ def __new__(cls) -> "ConfigSchemaT":  # type: ignore[misc]
                                 "Consider either calling Pikaur from your actual"
                                 " user account without `sudo`,"
                                 " or creating `pikaur` user"
-                                " and specifying its UserId in Pikaur config\n"
+                                " and specifying its UserId and GroupId in Pikaur config\n"
                                 "and set DynamicUsers to `never`.",
                             ),
                             "when_value": ["root", "always"],
@@ -552,6 +561,10 @@ def __new__(cls) -> "ConfigSchemaT":  # type: ignore[misc]
                         "data_type": INT,
                         "default": "0",
                     },
+                    "GroupId": {
+                        "data_type": INT,
+                        "default": "0",
+                    },
                     "PreserveEnv": {
                         "data_type": STR,
                         "default": (
@@ -612,18 +625,24 @@ def write_config(config: configparser.ConfigParser | None = None) -> None:
                 need_write = True
     if need_write:
         CustomUserId.update_fallback(int(config["misc"]["UserId"]))
+        CustomGroupId.update_fallback(int(config["misc"]["GroupId"]))
         config_root = ConfigRoot()
         config_path = ConfigPath()
         if not config_root.exists():
             config_root.mkdir(parents=True)
         with config_path.open("w", encoding=DEFAULT_CONFIG_ENCODING) as configfile:
             config.write(configfile)
         if custom_user_id := CustomUserId():
+            custom_group_id = CustomGroupId()
+            if not custom_group_id:
+                _err_write(translate(
+                    "Either both UserId and GroupId or neither of them should be set",
+                ))
             for path in (
                 config_root,
                 config_path,
             ):
-                os.chown(path, custom_user_id, custom_user_id)
+                os.chown(path, custom_user_id, custom_group_id)
 
 
 def str_to_bool(value: str) -> bool:
@@ -703,6 +722,7 @@ def get_config(cls) -> configparser.ConfigParser:
             write_config(config=cls._config)
             cls.validate_config()
             CustomUserId.update_fallback(int(cls._config["misc"]["UserId"]))
+            CustomGroupId.update_fallback(int(cls._config["misc"]["GroupId"]))
         return cls._config
 
     def __getattr__(self, attr: str) -> PikaurConfigSection:

pikaur/main.py

@@ -84,7 +84,7 @@ def init_readline() -> None:
 init_readline()
 
 SYSTEMD_MIN_VERSION: "Final" = 235
-logger = create_logger(f"main_{os.getuid()}")
+logger = create_logger(f"main_{os.getuid()}_{os.getgid()}")
 
 
 # @TODO: use arg to enable it

pikaur/os_utils.py

@@ -107,16 +107,19 @@ def check_executables(dep_names: list[str]) -> None:
 def chown_to_current(path: Path) -> None:
     args = parse_args()
     user_id = args.user_id
-    if user_id:
+    group_id = args.group_id
+    if user_id and group_id:
         if not isinstance(user_id, int):
             raise TypeError
+        if not isinstance(group_id, int):
+            raise TypeError
         try:
-            os.chown(path, user_id, user_id)
+            os.chown(path, user_id, group_id)
         except PermissionError as exc:
             print_error()
             print_error(
-                translate("Can't change owner to {user_id}: {exc}").format(
-                    user_id=user_id, exc=exc,
+                translate("Can't change owner to {user_id}:{group_id}: {exc}").format(
+                    user_id=user_id, group_id=group_id, exc=exc,
                 ),
             )
             print_error()

pikaur/privilege.py

@@ -102,6 +102,7 @@ def get_args_to_elevate_pikaur(original_args: list[str]) -> list[str]:
     if not need_dynamic_users():
         extra_args += [
             ("--user-id", str(args.user_id or os.getuid())),
+            ("--group-id", str(args.group_id or os.getgid())),
             ("--home-dir", str(args.home_dir or "") or Path.home().as_posix()),
         ]
         for flag, arg_key, env_key in (