parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

exec/file: chmod(): add privileged=True, use False for get_temp_dir()

Browse source
This commit is contained in:
InsanePrawn 2023-04-17 04:43:07 +02:00
parent 44eaf0d767
commit fd2abd3805
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
exec/file.py
View file

@ -8,7 +8,7 @@ from shutil import rmtree
from tempfile import mkdtemp from tempfile import mkdtemp
from typing import Optional, Union from typing import Optional, Union
from .cmd import run_root_cmd, elevation_noop, generate_cmd_su, wrap_in_bash, shell_quote from .cmd import run_cmd, run_root_cmd, elevation_noop, generate_cmd_su, wrap_in_bash, shell_quote
from utils import get_user_name, get_group_name from utils import get_user_name, get_group_name
@ -41,7 +41,7 @@ def chown(path: str, user: Optional[Union[str, int]] = None, group: Optional[Uni
raise Exception(f"Failed to change owner of '{path}' to '{owner}'") raise Exception(f"Failed to change owner of '{path}' to '{owner}'")
def chmod(path, mode: Union[int, str] = 0o0755, force_sticky=True): def chmod(path, mode: Union[int, str] = 0o0755, force_sticky=True, privileged: bool = True):
if not isinstance(mode, str): if not isinstance(mode, str):
octal = oct(mode)[2:] octal = oct(mode)[2:]
else: else:
@ -54,7 +54,7 @@ def chmod(path, mode: Union[int, str] = 0o0755, force_sticky=True):
os.chmod(path, mode=octal) # type: ignore os.chmod(path, mode=octal) # type: ignore
except: except:
cmd = ["chmod", octal, path] cmd = ["chmod", octal, path]
result = run_root_cmd(cmd) result = run_cmd(cmd, switch_user='root' if privileged else None)
assert isinstance(result, subprocess.CompletedProcess) assert isinstance(result, subprocess.CompletedProcess)
if result.returncode: if result.returncode:
raise Exception(f"Failed to set mode of '{path}' to '{chmod}'") raise Exception(f"Failed to set mode of '{path}' to '{chmod}'")
@ -174,7 +174,7 @@ def symlink(source, target):
def get_temp_dir(register_cleanup=True, mode: int = 0o0755): def get_temp_dir(register_cleanup=True, mode: int = 0o0755):
"create a new tempdir and sanitize ownership so root can access user files as god intended" "create a new tempdir and sanitize ownership so root can access user files as god intended"
t = mkdtemp() t = mkdtemp()
chmod(t, mode) chmod(t, mode, privileged=False)
if register_cleanup: if register_cleanup:
atexit.register(remove_file, t, recursive=True) atexit.register(remove_file, t, recursive=True)
return t return t