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

[enh] Catch unknown uid/gid in utils.filesystem.chown

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-21 18:40:52 +02:00
parent 79e46a5160
commit a092370710
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
locales/en.json
View file

@ -38,5 +38,8 @@
"logged_out" : "Logged out", "logged_out" : "Logged out",
"not_logged_in" : "You are not logged in", "not_logged_in" : "You are not logged in",
"server_already_running" : "A server is already running on that port", "server_already_running" : "A server is already running on that port",
"websocket_request_expected" : "Expected a WebSocket request" "websocket_request_expected" : "Expected a WebSocket request",
"unknown_user" : "Unknown '{user}' user",
"unknown_group" : "Unknown '{group}' group"
} }

14
moulinette/utils/filesystem.py
View file

@ -4,6 +4,8 @@ import shutil
from pwd import getpwnam from pwd import getpwnam
from grp import getgrnam from grp import getgrnam
from moulinette.core import MoulinetteError
# Files & directories -------------------------------------------------- # Files & directories --------------------------------------------------
@ -60,11 +62,19 @@ def chown(path, uid=None, gid=None, recursive=False):
# Retrieve uid/gid # Retrieve uid/gid
if isinstance(uid, basestring): if isinstance(uid, basestring):
uid = getpwnam(uid).pw_uid try:
uid = getpwnam(uid).pw_uid
except KeyError:
raise MoulinetteError(errno.EINVAL,
m18n.g('unknown_user', user=uid))
elif uid is None: elif uid is None:
uid = -1 uid = -1
if isinstance(gid, basestring): if isinstance(gid, basestring):
gid = getpwnam(gid).gr_gid try:
gid = getpwnam(gid).gr_gid
except KeyError:
raise MoulinetteError(errno.EINVAL,
m18n.g('unknown_group', group=gid))
elif gid is None: elif gid is None:
gid = -1 gid = -1