Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-08 23:17:14 +00:00
parent 3405ea6dd9 1167c6dbf8
commit 5ba2c300d8
9 changed files with 91 additions and 9 deletions
--- 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