Merge pull request #987 from wheelert/email-attachment-settings

updated validate_file_extension() to look for defined VALID_EXTENSIONS
This commit is contained in:
Garret Wassermann 2021-12-31 22:22:45 -05:00 committed by GitHub
commit 09494e961e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,14 +2,24 @@
# #
# validators for file uploads, etc. # validators for file uploads, etc.
from django.conf import settings
#TODO: can we use the builtin Django validator instead?
# see: https://docs.djangoproject.com/en/4.0/ref/validators/#fileextensionvalidator
def validate_file_extension(value): def validate_file_extension(value):
import os import os
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
ext = os.path.splitext(value.name)[1] # [0] returns path+filename ext = os.path.splitext(value.name)[1] # [0] returns path+filename
valid_extensions = ['.txt', '.pdf', '.doc', '.docx', '.odt', '.jpg', '.png']
# TODO: we might improve this with more thorough checks of file types # TODO: we might improve this with more thorough checks of file types
# rather than just the extensions. # rather than just the extensions.
# check if VALID_EXTENSIONS is defined in settings.py
# if not use defaults
if settings.VALID_EXTENSIONS:
valid_extensions = settings.VALID_EXTENSIONS
else:
valid_extensions = ['.txt', '.pdf', '.doc', '.docx', '.odt', '.jpg', '.png']
if not ext.lower() in valid_extensions: if not ext.lower() in valid_extensions:
raise ValidationError('Unsupported file extension.') raise ValidationError('Unsupported file extension.')