ge/imgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: Refactored uplocad_image(), MIME check skipping added

Browse Source
This commit is contained in:
gd 2022-01-05 07:16:24 +03:00
parent 87f6c3a048
commit 8e4ab793f9
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
imgs.py
View File

@ -48,30 +48,38 @@ def upload_image():
# Handle request from CLI # Handle request from CLI
if request.files.get('image'): if request.files.get('image'):
file = request.files.get('image') file = request.files.get('image')
if file.content_type in config['imgs.allowed_mime_types']: rq = 'cli'
image_name = upload_file(file)
return get_image_url(image_name) + '\n'
else:
# Prevent recource leek. Force close buffered file
request.body.close()
response.status = 415
return 'Error: bad file MIME type\n'
# Handle request from web-browser # Handle request from web-browser
elif request.files.get('image_web'): elif request.files.get('image_web'):
file = request.files.get('image_web') file = request.files.get('image_web')
if file.content_type in config['imgs.allowed_mime_types']: rq = 'web'
if config['imgs.allowed_mime_types'] == '*':
# Skip MIME checking.
image_name = upload_file(file) image_name = upload_file(file)
return template('index.tpl',
uploaded = True, not_found = False, bad_mime_type = False,
base_url = get_base_url(), image_url = get_image_url(image_name))
else: else:
if file.content_type in config['imgs.allowed_mime_types']:
# Upload file!
image_name = upload_file(file)
else:
# Show MIME type error!
# Prevent recource leek. Force close buffered file # Prevent recource leek. Force close buffered file
request.body.close() request.body.close()
response.status = 415 response.status = 415
if rq == 'cli':
return 'Error: bad file MIME type\n'
else:
return template('index.tpl', return template('index.tpl',
uploaded = False, not_found = False, bad_mime_type = True, uploaded = False, not_found = False, bad_mime_type = True,
allowed_mime_types = config['imgs.allowed_mime_types'], allowed_mime_types = config['imgs.allowed_mime_types'],
base_url = get_base_url(), image_url = 'None') base_url = get_base_url(), image_url = 'None')
# Return 200 OK
if rq == 'cli':
return get_image_url(image_name) + '\n'
else:
return template('index.tpl',
uploaded = True, not_found = False, bad_mime_type = False,
base_url = get_base_url(), image_url = get_image_url(image_name))
@get('/<image_name>') @get('/<image_name>')
def send_image(image_name): def send_image(image_name):