diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
| commit | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (patch) | |
| tree | a3bb67479db79ca9777cf2d6c1b767ad0f0f53d2 /app/controllers/api | |
| parent | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (diff) | |
| parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/salmon_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb index 143e9d3cd..ac5f3268d 100644 --- a/app/controllers/api/salmon_controller.rb +++ b/app/controllers/api/salmon_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Api::SalmonController < Api::BaseController + include SignatureVerification + before_action :set_account respond_to :txt @@ -9,7 +11,7 @@ class Api::SalmonController < Api::BaseController process_salmon head 202 elsif payload.present? - [signature_verification_failure_reason, 401] + render plain: signature_verification_failure_reason, status: 401 else head 400 end |