Skip to content

Add more accurate BadRequest handling #5786

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

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

Add more accurate BadRequest handling #5786

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class ApplicationController < ActionController::Base
rescue_from GdsApi::HTTPNotFound, with: :cacheable_404
rescue_from GdsApi::InvalidUrl, with: :cacheable_404
rescue_from GdsApi::HTTPForbidden, with: :error_403
rescue_from GdsApi::HTTPBadRequest, with: :error_400
rescue_from RecordNotFound, with: :cacheable_404

# Because this code contains an if statement evaluated on Rails load and is just
Expand All @@ -27,6 +28,10 @@ class ApplicationController < ActionController::Base

helper_method :content_item

def error_400
error :bad_request
end

def error_403
error :forbidden
end
Expand Down
2 changes: 1 addition & 1 deletion lib/content_item_loader.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def load_from_sources(base_path)
end

default_loader.load(base_path:)
rescue GdsApi::HTTPErrorResponse, GdsApi::InvalidUrl => e
rescue GdsApi::HTTPErrorResponse, GdsApi::InvalidUrl, GdsApi::HTTPBadRequest => e
e
end

Expand Down