about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-05-14 23:28:06 +0200
committerGitHub <noreply@github.com>2020-05-14 23:28:06 +0200
commit71fce71c94b1e94ae3a7af17bfc141709b61c428 (patch)
tree492cd66640ca1ac97289f073fb55a9301e2daefa /app/controllers
parentc9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e (diff)
Fix webfinger returning wrong status code on malformed or missing param (#13759)
Fixes #13757
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/well_known/webfinger_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb
index 480e58f3f..9de9db6ba 100644
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -8,7 +8,8 @@ module WellKnown
     before_action :set_account
     before_action :check_account_suspension
 
-    rescue_from ActiveRecord::RecordNotFound, ActionController::ParameterMissing, with: :not_found
+    rescue_from ActiveRecord::RecordNotFound, with: :not_found
+    rescue_from ActionController::ParameterMissing, WebfingerResource::InvalidRequest, with: :bad_request
 
     def show
       expires_in 3.days, public: true
@@ -37,6 +38,10 @@ module WellKnown
       expires_in(3.minutes, public: true) && gone if @account.suspended?
     end
 
+    def bad_request
+      head 400
+    end
+
     def not_found
       head 404
     end