CC-3299: Media monitor should not change the owner of watched files

- bug fix
- better logging
This commit is contained in:
james 2012-02-07 13:34:04 -05:00
parent 22a53dd250
commit b08e7787d3
2 changed files with 7 additions and 3 deletions

View file

@ -51,8 +51,8 @@ class MediaMonitorCommon:
gid = grp.getgrnam(egid)[2]
#drop root permissions and become "nobody"
os.seteuid(uid)
os.setegid(gid)
os.seteuid(uid)
try:
open(filepath)
@ -66,6 +66,7 @@ class MediaMonitorCommon:
finally:
#reset effective user to root
os.seteuid(0)
os.setegid(0)
return readable
@ -74,7 +75,7 @@ class MediaMonitorCommon:
try:
omask = os.umask(0)
if not has_correct_permissions(item, 'www-data', 'www-data'):
if not self.has_correct_permissions(item, 'www-data', 'www-data'):
uid = pwd.getpwnam('www-data')[2]
gid = grp.getgrnam('www-data')[2]