Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3749: Media Monitor should not load files pypo cannot read

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-05-04 13:23:46 -04:00
parent ebc8af0863
commit 08217d59fc
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View file

@ -79,18 +79,24 @@ class MediaMonitorCommon:
def set_needed_file_permissions(self, item, is_dir): def set_needed_file_permissions(self, item, is_dir):
try: try:
omask = os.umask(0) omask = os.umask(0)
if not self.has_correct_permissions(item, 'www-data', 'www-data') or not self.has_correct_permissions(item, 'pypo', 'pypo'): if not self.has_correct_permissions(item, 'www-data', 'www-data') \
or not self.has_correct_permissions(item, 'pypo', 'pypo'):
# stats.st_mode is the original permission # stats.st_mode is the original permission
# stat.S_IROTH - readable by all permission # stat.S_IROTH - readable by all permission
# stat.S_IXOTH - excutable by all permission # stat.S_IXOTH - excutable by all permission
# try to set permission # try to set permission
self.logger.info("%s has incorrect permissions. Will modify to be readable.", item) self.logger.warn("%s has incorrect permissions for reading. Skipping import.", item)
if self.is_parent_directory(item, self.config.storage_directory) or self.is_parent_directory(item, self.config.imported_directory) or self.is_parent_directory(item, self.config.organize_directory): """
if self.is_parent_directory(item, self.config.storage_directory) \
or self.is_parent_directory(item, self.config.imported_directory) \
or self.is_parent_directory(item, self.config.organize_directory):
if is_dir is True: if is_dir is True:
os.chmod(item, 02777) os.chmod(item, 02777)
else: else:
os.chmod(item, 0666) os.chmod(item, 0666)
else : else:
# add world readable permission # add world readable permission
stats = os.stat(item) stats = os.stat(item)
if is_dir is True: if is_dir is True:
@ -98,6 +104,7 @@ class MediaMonitorCommon:
else: else:
bitor = stats.st_mode | stat.S_IROTH bitor = stats.st_mode | stat.S_IROTH
os.chmod(item, bitor) os.chmod(item, bitor)
"""
except Exception, e: except Exception, e:
self.logger.warn("Failed to change owner/group/permissions for %s", item) self.logger.warn("Failed to change owner/group/permissions for %s", item)
return False return False