Ensure request.body isn't emptied out before signature verification (#10432)

Fixes #10429
2019-03-31 17:27:24 +02:00 · 2019-03-31 17:27:24 +02:00 · 65930be714
commit 65930be714
parent 0aea1c0775
1 changed files with 4 additions and 1 deletions
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@ -32,7 +32,10 @@ class ActivityPub::InboxesController < Api::BaseController
  end

  def body
-    @body ||= request.body.read.force_encoding('UTF-8')
+    return @body if defined?(@body)
+    @body = request.body.read.force_encoding('UTF-8')
+    request.body.rewind if request.body.respond_to?(:rewind)
+    @body
  end

  def upgrade_account