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

stream_to_gcs: Return a BadRequest(400) error when content type is missing

Browse Source 
We're using uploaded_file.content_type.startswith('image/'), which
fails with an AttributeError if uploaded_file.content_type is None. We
now check for this and properly return info about the missing conten type
to the caller.
This commit is contained in:
Sybren A. Stüvel 2016-07-07 11:10:50 +02:00
parent 782ac9ac1e
commit ff8d5c96b7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ from flask import url_for, helpers
from flask import current_app from flask import current_app
from flask import g from flask import g
from flask import make_response from flask import make_response
from werkzeug.exceptions import NotFound, InternalServerError from werkzeug.exceptions import NotFound, InternalServerError, BadRequest
from application import utils from application import utils
from application.utils import remove_private_keys, authentication from application.utils import remove_private_keys, authentication
@ -300,7 +300,6 @@ def generate_link(backend, file_path, project_id=None, is_public=False):
return '' return ''
def before_returning_file(response): def before_returning_file(response):
ensure_valid_link(response) ensure_valid_link(response)
@ -522,11 +521,14 @@ def override_content_type(uploaded_file):
@file_storage.route('/stream/<string:project_id>', methods=['POST', 'OPTIONS']) @file_storage.route('/stream/<string:project_id>', methods=['POST', 'OPTIONS'])
@require_login() @require_login()
def stream_to_gcs(project_id): def stream_to_gcs(project_id):
projects = current_app.data.driver.db['projects']
try: try:
project = projects.find_one(ObjectId(project_id), projection={'_id': 1}) project_oid = ObjectId(project_id)
except InvalidId: except InvalidId:
project = None raise BadRequest('Invalid ObjectID')
projects = current_app.data.driver.db['projects']
project = projects.find_one(project_oid, projection={'_id': 1})
if not project: if not project:
raise NotFound('Project %s does not exist' % project_id) raise NotFound('Project %s does not exist' % project_id)
@ -534,10 +536,14 @@ def stream_to_gcs(project_id):
authentication.current_user_id()) authentication.current_user_id())
uploaded_file = request.files['file'] uploaded_file = request.files['file']
file_id, internal_fname, status = create_file_doc_for_upload(project['_id'], uploaded_file) file_id, internal_fname, status = create_file_doc_for_upload(project_oid, uploaded_file)
override_content_type(uploaded_file) override_content_type(uploaded_file)
if not uploaded_file.content_type:
log.warning('File uploaded to project %s without content type.', project_oid)
raise BadRequest('Missing content type.')
if uploaded_file.content_type.startswith('image/'): if uploaded_file.content_type.startswith('image/'):
# We need to do local thumbnailing, so we have to write the stream # We need to do local thumbnailing, so we have to write the stream
# both to Google Cloud Storage and to local storage. # both to Google Cloud Storage and to local storage.