diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-26 01:09:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-26 01:09:30 +0200 |
commit | ebf2fef029bb44dc3872c4fa578cbbda6ec506b2 (patch) | |
tree | 51054c38907e71eaa8e6e5f02eef65e38c34c1ab /app | |
parent | d87649db074b6b9700246d9488f82071d41fcb60 (diff) |
Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
An error like that should not appear in production error log.
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5b22f17c6..29ba6cad6 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -20,6 +20,7 @@ class ApplicationController < ActionController::Base rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity + rescue_from ActionController::UnknownFormat, with: :not_acceptable rescue_from Mastodon::NotPermittedError, with: :forbidden before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? @@ -73,6 +74,10 @@ class ApplicationController < ActionController::Base respond_with_error(422) end + def not_acceptable + respond_with_error(406) + end + def single_user_mode? @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.exists? end |