archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Don't double-x mime types

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-05-02 17:04:18 +02:00
parent 6394d83da2
commit 445bf601dc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pillar/application/modules/file_storage.py
View File

@ -196,7 +196,12 @@ def process_file(gcs, file_id, local_file):
# Prevent video handling for non-admins.
if not user_has_role(u'admin') and mime_category == 'video':
src_file['content_type'] = 'application/x-%s' % src_file['format']
if src_file['format'].startswith('x-'):
xified = src_file['format']
else:
xified = 'x-' + src_file['format']
src_file['content_type'] = 'application/%s' % xified
mime_category = 'application'
log.info('Not processing video file %s for non-admin user', file_id)