Git-Mirrors/mat2-web
1
0
Fork 0
mirror of https://0xacab.org/jvoisin/mat2-web.git synced 2025-05-12 11:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

handle not supported files in zips

Browse source
This commit is contained in:
Jan Friedli 2020-09-13 16:56:02 +02:00
parent 493626e195
commit f93a793469
No known key found for this signature in database
GPG key ID: F945FA2FCA30549D
3 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

31
matweb/frontend.py
View file

@ -71,22 +71,23 @@ def upload_file():
current_app.logger.error('Unsupported type %s', mime) current_app.logger.error('Unsupported type %s', mime)
return redirect(url_for('routes.upload_file')) return redirect(url_for('routes.upload_file'))
meta = parser.get_meta() try:
if parser.remove_all() is not True:
flash('Unable to clean %s' % mime)
current_app.logger.error('Unable to clean %s', mime)
return redirect(url_for('routes.upload_file'))
meta = parser.get_meta()
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, current_app.config['UPLOAD_FOLDER'])
if parser.remove_all() is not True: return render_template(
flash('Unable to clean %s' % mime) 'download.html',
current_app.logger.error('Unable to clean %s', mime) mimetypes=mime_types,
return redirect(url_for('routes.upload_file')) meta=meta,
download_uri=url_for('routes.download_file', key=key, secret=secret, filename=output_filename),
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, current_app.config['UPLOAD_FOLDER']) meta_after=meta_after,
)
return render_template( except (RuntimeError, ValueError):
'download.html', flash('The type %s could no be cleaned' % mime)
mimetypes=mime_types,
meta=meta,
download_uri=url_for('routes.download_file', key=key, secret=secret, filename=output_filename),
meta_after=meta_after,
)
max_file_size = int(current_app.config['MAX_CONTENT_LENGTH'] / 1024 / 1024) max_file_size = int(current_app.config['MAX_CONTENT_LENGTH'] / 1024 / 1024)
return render_template('index.html', max_file_size=max_file_size, mimetypes=mime_types) return render_template('index.html', max_file_size=max_file_size, mimetypes=mime_types)

46
matweb/rest_api.py
View file

@ -46,29 +46,31 @@ class APIUpload(Resource):
if parser is None: if parser is None:
current_app.logger.error('Upload - Invalid mime type %s', mime) current_app.logger.error('Upload - Invalid mime type %s', mime)
abort(415, message='The type %s is not supported' % mime) abort(415, message='The type %s is not supported' % mime)
try:
meta = parser.get_meta() if not parser.remove_all():
if not parser.remove_all(): raise ValueError()
meta = parser.get_meta()
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath,
current_app.config['UPLOAD_FOLDER'])
return utils.return_file_created_response(
utils.get_file_removal_max_age_sec(),
output_filename,
mime,
key,
secret,
meta,
meta_after,
url_for(
'api_bp.apidownload',
key=key,
secret=secret,
filename=output_filename,
_external=True
)
), 201
except (ValueError, RuntimeError) as e:
current_app.logger.error('Upload - Cleaning failed with mime: %s', mime) current_app.logger.error('Upload - Cleaning failed with mime: %s', mime)
abort(500, message='Unable to clean %s' % mime) abort(400, message='Unable to clean %s' % mime)
key, secret, meta_after, output_filename = utils.cleanup(parser, filepath, current_app.config['UPLOAD_FOLDER'])
return utils.return_file_created_response(
utils.get_file_removal_max_age_sec(),
output_filename,
mime,
key,
secret,
meta,
meta_after,
url_for(
'api_bp.apidownload',
key=key,
secret=secret,
filename=output_filename,
_external=True
)
), 201
class APIDownload(Resource): class APIDownload(Resource):

1
test/test_api.py
View file

@ -135,6 +135,7 @@ class Mat2APITestCase(unittest.TestCase):
headers={'content-type': 'application/json'} headers={'content-type': 'application/json'}
) )
error = request.get_json()['message'] error = request.get_json()['message']
self.assertEqual(request.status_code, 400)
self.assertEqual(error, 'Unable to clean application/zip') self.assertEqual(error, 'Unable to clean application/zip')
def test_api_download(self): def test_api_download(self):