Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE...

If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.

diff --git a/.env.production.sample b/.env.production.sample
index 3047f759501854bd0c7025de39de425f49fad953..ebb0788781d59a7dc0705cbdf298359eee60e282 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -229,5 +229,3 @@ STREAMING_CLUSTER_NUM=1
 # http_proxy=http://gateway.local:8118
 # Access control for hidden service.
 # ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
-# If you use transparent proxy to access to hidden service, uncomment following for skipping private address check.
-# HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY=true

diff --git a/app/lib/request.rb b/app/lib/request.rb
index 397614fac9d48766f77e76a5f63860040ec0bb8a..576ed23ca0c21561c81147f642523e74dba1805b 100644 (file)
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -154,7 +154,7 @@ class Request
       alias new open
 
       def thru_hidden_service?(host)
-        Rails.configuration.x.hidden_service_via_transparent_proxy && /\.(onion|i2p)$/.match(host)
+        Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match(host)
       end
     end
   end

diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index 52c595c5d96dabd2ce26950c9d48cf6c7f844217..e607aff3c406addd93413f8954d95defc4c52cb6 100644 (file)
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -11,7 +11,6 @@ Rails.application.configure do
   end
 
   config.x.access_to_hidden_service = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
-  config.x.hidden_service_via_transparent_proxy = ENV['HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY'] == 'true'
 end
 
 module Goldfinger

diff --git a/docker-compose.yml b/docker-compose.yml
index b31095a54074b202bb1aa47f32c6f986d1fbf8f1..c54c73e44a064cfddb0ac82b7024ed00a44a75c2 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,7 +83,6 @@ services:
 ## Uncomment to enable federation with tor instances along with adding the following ENV variables
 ## http_proxy=http://privoxy:8118
 ## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
-## HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY=true
 #  tor:
 #    build: https://github.com/usbsnowcrash/docker-tor.git
 #    networks: