Add a circuit breaker for ActivityPub deliveries (#7053)

diff --git a/Gemfile b/Gemfile
index 9e644e7ae3031113072a918f4d37d8c01c11210b..4a5a166bdb2d7d8032ea1637cc7f99ceabb71897 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'devise-two-factor', '~> 3.0'
 group :pam_authentication, optional: true do
   gem 'devise_pam_authenticatable2', '~> 9.0'
 end
+
 gem 'net-ldap', '~> 0.10'
 gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
@@ -79,6 +80,7 @@ gem 'sidekiq-bulk', '~>0.1.1'
 gem 'simple-navigation', '~> 4.0'
 gem 'simple_form', '~> 3.4'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
+gem 'stoplight', '~> 2.1.3'
 gem 'strong_migrations'
 gem 'tty-command'
 gem 'tty-prompt'

diff --git a/Gemfile.lock b/Gemfile.lock
index a185a602ee88f2c175aed10e200058da53768e73..0f5a1fb6ad79292cbaff5aa670b7a89b49e9555d 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -550,6 +550,7 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     statsd-ruby (1.2.1)
+    stoplight (2.1.3)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
     strong_migrations (0.1.9)
@@ -716,6 +717,7 @@ DEPENDENCIES
   simple_form (~> 3.4)
   simplecov (~> 0.14)
   sprockets-rails (~> 3.2)
+  stoplight (~> 2.1.3)
   streamio-ffmpeg (~> 3.0)
   strong_migrations
   tty-command

diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index e6cfd0d07e9c8ac26d52f62306276c060b1fa62f..adffd1d3bb2ed7f574891f3041e5148bddca2cf1 100644 (file)
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -12,9 +12,7 @@ class ActivityPub::DeliveryWorker
     @source_account = Account.find(source_account_id)
     @inbox_url      = inbox_url
 
-    perform_request do |response|
-      raise Mastodon::UnexpectedResponseError, response unless response_successful? response
-    end
+    perform_request
 
     failure_tracker.track_success!
   rescue => e
@@ -30,8 +28,14 @@ class ActivityPub::DeliveryWorker
     request.add_headers(HEADERS)
   end
 
-  def perform_request(&block)
-    build_request.perform(&block)
+  def perform_request
+    light = Stoplight(@inbox_url) do
+      build_request.perform do |response|
+        raise Mastodon::UnexpectedResponseError, response unless response_successful?(response)
+      end
+    end
+
+    light.run
   end
 
   def response_successful?(response)

diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
new file mode 100644 (file)
index 0000000..1bd4ee6
--- /dev/null
+++ b/config/initializers/stoplight.rb
@@ -0,0 +1,3 @@
+require 'stoplight'
+
+Stoplight::Light.default_data_store = Stoplight::DataStore::Redis.new(Redis.current)