Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to fix view on image validation failure #10009

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to fix view on image validation failure #10009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions openlibrary/plugins/upstream/covers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@ def setup():
pass


class image_validator:
class ImageValidator:
def __init__(self):
self.max_file_size = 10 * 1024 * 1024 # 10 MB
self.allowed_extensions = {'.jpg', '.jpeg', '.gif', '.png'}

def validate(self, file):
self.validate_extension(file.filename)
self.validate_size(file.file)
self.validate_image(file.file)

def validate_size(self, file_data):
file_size = len(file_data.read())
file_data.seek(0)
Expand Down Expand Up @@ -72,7 +77,10 @@ def POST(self, key):
# remove references to field storage objects
web.ctx.pop("_fieldstorage", None)

data = self.upload(key, i)
try:
data = self.upload(key, i)
except ValueError as e:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this except now covers more code than before, and ValueError is a somewhat generic error that can also be thrown by native python. I think we now might need to make a custom ImageValidationError to avoid accidentally masking unrelated bugs/ValueErrors.

return render_template("covers/add", book, status=web.storage({"code": 1}))

if coverid := data.get('id'):
if isinstance(i.url, bytes):
Expand All @@ -88,18 +96,10 @@ def upload(self, key, i):
olid = key.split("/")[-1]

if i.file is not None and hasattr(i.file, 'file'):
file_data = i.file.file
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we want to access i.file.file multiple times; I wonder if it might have side effects / not be cached. Having validate take the filename and the file data seems like a quick way to avoid it, or we can try to find a way to verify that calling it multiple times is ok.

filename = i.file.filename

validator = image_validator()
try:
validator.validate_extension(filename)
validator.validate_size(file_data)
validator.validate_image(file_data)
except ValueError as e:
return web.storage({'error': str(e)})

data = file_data
validator = ImageValidator()
validator.validate(i.file)

data = i.file.file
else:
data = None

Expand Down
Loading