Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/app/controllers/activity_pub/projects/application_controller.rb b/app/controllers/activity_pub/projects/application_controller.rb
new file mode 100644
index 00000000000..e54a457743d
--- /dev/null
+++ b/app/controllers/activity_pub/projects/application_controller.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ActivityPub
+  module Projects
+    class ApplicationController < ::ActivityPub::ApplicationController
+      before_action :project
+      before_action :ensure_project_feature_flag
+
+      private
+
+      def project
+        return unless params[:project_id] || params[:id]
+
+        path = File.join(params[:namespace_id], params[:project_id] || params[:id])
+
+        @project = find_routable!(Project, path, request.fullpath, extra_authorization_proc: auth_proc)
+      end
+
+      def auth_proc
+        ->(project) { project.public? && !project.pending_delete? }
+      end
+
+      def ensure_project_feature_flag
+        not_found unless ::Feature.enabled?(:activity_pub_project, project)
+      end
+    end
+  end
+end