YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

appsv2: fix user provisionion ... Aleks was drunk ... check_output('cmd &>/dev/null') will always return empty string...

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-18 16:08:26 +01:00
parent 475c93d582
commit d123fd7674
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/utils/resources.py
View file

@ -469,13 +469,13 @@ class SystemuserAppResource(AppResource):
# FIXME : validate that no yunohost user exists with that name?
# and/or that no system user exists during install ?
if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip():
if os.system(f"getent passwd {self.app} &>/dev/null") != 0:
# FIXME: improve logging ? os.system wont log stdout / stderr
cmd = f"useradd --system --user-group {self.app}"
ret = os.system(cmd)
assert ret == 0, f"useradd command failed with exit code {ret}"
if not check_output(f"getent passwd {self.app} &>/dev/null || true").strip():
if os.system(f"getent passwd {self.app} &>/dev/null") != 0:
raise YunohostError(
f"Failed to create system user for {self.app}", raw_msg=True
)
@ -495,16 +495,16 @@ class SystemuserAppResource(AppResource):
os.system(f"usermod -G {','.join(groups)} {self.app}")
def deprovision(self, context: Dict = {}):
if check_output(f"getent passwd {self.app} &>/dev/null || true").strip():
if os.system(f"getent passwd {self.app} &>/dev/null") == 0:
os.system(f"deluser {self.app} >/dev/null")
if check_output(f"getent passwd {self.app} &>/dev/null || true").strip():
if os.system(f"getent passwd {self.app} &>/dev/null") == 0:
raise YunohostError(
f"Failed to delete system user for {self.app}", raw_msg=True
)
if check_output(f"getent group {self.app} &>/dev/null || true").strip():
if os.system(f"getent group {self.app} &>/dev/null") == 0:
os.system(f"delgroup {self.app} >/dev/null")
if check_output(f"getent group {self.app} &>/dev/null || true").strip():
if os.system(f"getent group {self.app} &>/dev/null") == 0:
raise YunohostError(
f"Failed to delete system user for {self.app}", raw_msg=True
)