From 8404434f91a7df3d1bd596b15c4ce8034c2d3ab1 Mon Sep 17 00:00:00 2001
From: astra <nocebo@cathoderay.tube>
Date: Tue, 8 Oct 2024 09:27:40 -0400
Subject: [PATCH] initial wiring for outbound proxy

---
 Gemfile                                    | 4 ++--
 config/defaults.yml                        | 1 +
 config/diaspora.toml.example               | 3 +++
 config/initializers/diaspora_federation.rb | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9c6ee61b7..60a174c08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,8 +19,8 @@ gem "puma", "6.4.2", require: false
 
 # Federation
 
-gem "diaspora_federation-json_schema", "1.1.0"
-gem "diaspora_federation-rails",       "1.1.0"
+gem "diaspora_federation-json_schema", git: "https://git.gynoid.me/nocebo/diaspora_federation.git", branch: "outbound-proxy"
+gem "diaspora_federation-rails", git: "https://git.gynoid.me/nocebo/diaspora_federation.git", branch: "outbound-proxy"
 
 # API and JSON
 
diff --git a/config/defaults.yml b/config/defaults.yml
index 29d4ebdab..7447f4f81 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -94,6 +94,7 @@ defaults:
       suggest_email:
     typhoeus_verbose: false
     typhoeus_concurrency: 20
+    http_proxy:
     archive_jobs_concurrency: 1
     username_blacklist:
       - 'admin'
diff --git a/config/diaspora.toml.example b/config/diaspora.toml.example
index 6401fc043..54df65d91 100644
--- a/config/diaspora.toml.example
+++ b/config/diaspora.toml.example
@@ -328,6 +328,9 @@
 ## of your Sidekiq workers.
 #typhoeus_concurrency = 20
 
+## Outbound HTTP proxy
+#http_proxy = "http://10.0.0.100:1234"
+
 ## Maximum number of parallel user data import/export jobs (default=1)
 ## Be careful, imports and exports of big/old profiles can use a lot of memory,
 ## running many of them in parallel can be a problem for small servers.
diff --git a/config/initializers/diaspora_federation.rb b/config/initializers/diaspora_federation.rb
index 941eae17c..ad1d81aa2 100644
--- a/config/initializers/diaspora_federation.rb
+++ b/config/initializers/diaspora_federation.rb
@@ -11,6 +11,7 @@ DiasporaFederation.configure do |config|
 
   config.http_concurrency = AppConfig.settings.typhoeus_concurrency.to_i
   config.http_verbose = AppConfig.settings.typhoeus_verbose?
+  config.http_proxy = AppConfig.settings.http_proxy
 
   config.define_callbacks do
     on :fetch_person_for_webfinger do |diaspora_id|