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.

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

Return error instead of raise Exception for BadRequest in querystringsearch #84

Merged
merged 1 commit into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ Changelog

5.3.1 (unreleased)
------------------

- Return error instead of raise Excpetion for BadRequest in querystringsearch
[mamico]

- Add upgrade step and setuphandler to fix robots.txt
original rules adding 'Allow: /*?expand*'
[lucabel]

- Nothing changed yet.


5.3.0 (2023-10-25)
------------------
Expand Down
12 changes: 8 additions & 4 deletions src/redturtle/volto/restapi/services/querystringsearch/get.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,20 @@ def __call__(self):
try:
b_start = int(data.get("b_start", 0))
except ValueError:
raise BadRequest("Invalid b_start")
self.request.response.setStatus(400)
return dict(error=dict(type="BadRequest", message="Invalid b_start"))
try:
b_size = int(data.get("b_size", 25))
except ValueError:
raise BadRequest("Invalid b_size")
self.request.response.setStatus(400)
return dict(error=dict(type="BadRequest", message="Invalid b_size"))
sort_on = data.get("sort_on", None)
sort_order = data.get("sort_order", None)

# LIMIT PATCH
if not query:
raise BadRequest("No query supplied")
self.request.response.setStatus(400)
return dict(error=dict(type="BadRequest", message="No query supplied"))
limit = self.get_limit(data=data)
# END OF LIMIT PATCH

Expand Down Expand Up @@ -86,7 +89,8 @@ def __call__(self):
# This can happen if the query has an invalid operation,
# but plone.app.querystring doesn't raise an exception
# with specific info.
raise BadRequest("Invalid query.")
self.request.response.setStatus(400)
return dict(error=dict(type="BadRequest", message="Invalid query"))

results = getMultiAdapter((results, self.request), ISerializeToJson)(
fullobjects=fullobjects
Expand Down
Loading