From 7720c684c5bf54e73e8815defe15473777d1c201 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 15 Mar 2024 06:40:21 -0400
Subject: [PATCH] Move common module inclusion in sub classes to
`ActivityPub::BaseController` (#29560)
---
app/controllers/activitypub/base_controller.rb | 3 +++
app/controllers/activitypub/claims_controller.rb | 3 ---
app/controllers/activitypub/collections_controller.rb | 3 ---
.../activitypub/followers_synchronizations_controller.rb | 3 ---
app/controllers/activitypub/inboxes_controller.rb | 2 --
app/controllers/activitypub/outboxes_controller.rb | 3 ---
app/controllers/activitypub/replies_controller.rb | 2 --
app/controllers/instance_actors_controller.rb | 7 +++++++
8 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb
index 388d4b9e1..c2563c492 100644
--- a/app/controllers/activitypub/base_controller.rb
+++ b/app/controllers/activitypub/base_controller.rb
@@ -1,6 +1,9 @@
# frozen_string_literal: true
class ActivityPub::BaseController < Api::BaseController
+ include SignatureVerification
+ include AccountOwnedConcern
+
skip_before_action :require_authenticated_user!
skip_before_action :require_not_suspended!
skip_around_action :set_locale
diff --git a/app/controllers/activitypub/claims_controller.rb b/app/controllers/activitypub/claims_controller.rb
index 339333e46..480baaf2b 100644
--- a/app/controllers/activitypub/claims_controller.rb
+++ b/app/controllers/activitypub/claims_controller.rb
@@ -1,9 +1,6 @@
# frozen_string_literal: true
class ActivityPub::ClaimsController < ActivityPub::BaseController
- include SignatureVerification
- include AccountOwnedConcern
-
skip_before_action :authenticate_user!
before_action :require_account_signature!
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 2188eb72a..d5632902f 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -1,9 +1,6 @@
# frozen_string_literal: true
class ActivityPub::CollectionsController < ActivityPub::BaseController
- include SignatureVerification
- include AccountOwnedConcern
-
vary_by -> { 'Signature' if authorized_fetch_mode? }
before_action :require_account_signature!, if: :authorized_fetch_mode?
diff --git a/app/controllers/activitypub/followers_synchronizations_controller.rb b/app/controllers/activitypub/followers_synchronizations_controller.rb
index d2942104e..392dd36bc 100644
--- a/app/controllers/activitypub/followers_synchronizations_controller.rb
+++ b/app/controllers/activitypub/followers_synchronizations_controller.rb
@@ -1,9 +1,6 @@
# frozen_string_literal: true
class ActivityPub::FollowersSynchronizationsController < ActivityPub::BaseController
- include SignatureVerification
- include AccountOwnedConcern
-
vary_by -> { 'Signature' if authorized_fetch_mode? }
before_action :require_account_signature!
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index e8b0f47cd..49cfc8ad1 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
class ActivityPub::InboxesController < ActivityPub::BaseController
- include SignatureVerification
include JsonLdHelper
- include AccountOwnedConcern
before_action :skip_unknown_actor_activity
before_action :require_actor_signature!
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index bf10ba762..8079e011d 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -3,9 +3,6 @@
class ActivityPub::OutboxesController < ActivityPub::BaseController
LIMIT = 20
- include SignatureVerification
- include AccountOwnedConcern
-
vary_by -> { 'Signature' if authorized_fetch_mode? || page_requested? }
before_action :require_account_signature!, if: :authorized_fetch_mode?
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index c38ff89d1..3f43e89a5 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -1,9 +1,7 @@
# frozen_string_literal: true
class ActivityPub::RepliesController < ActivityPub::BaseController
- include SignatureVerification
include Authorization
- include AccountOwnedConcern
DESCENDANTS_LIMIT = 60
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index 8422d74bc..f2b1eaa3e 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -6,6 +6,8 @@ class InstanceActorsController < ActivityPub::BaseController
serialization_scope nil
before_action :set_account
+
+ skip_before_action :authenticate_user! # From `AccountOwnedConcern`
skip_before_action :require_functional!
skip_before_action :update_user_sign_in
@@ -16,6 +18,11 @@ class InstanceActorsController < ActivityPub::BaseController
private
+ # Skips various `before_action` from `AccountOwnedConcern`
+ def account_required?
+ false
+ end
+
def set_account
@account = Account.representative
end