From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 25 May 2018 23:09:30 +0000 (+0200)
Subject: Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ebf2fef029bb44dc3872c4fa578cbbda6ec506b2;p=mastodon.git

Catch ActionController::UnknownFormat and return HTTP 406 (#7621)

An error like that should not appear in production error log.
---

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