Merge pull request #1089 from alvasw/tor_add_torrc_overrides_to_types…

…afe_config

Settings: Add torrc_overrides to typesafe config

desktop_app/src/main/resources/desktop.conf

@@ -105,6 +105,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
+                torrc_overrides = {}
                 socketTimeout = 120
             }
             i2p { 

network/tor/build.gradle

@@ -22,6 +22,7 @@ dependencies {
     implementation libs.google.guava
     implementation libs.failsafe
     implementation libs.tukaani
+    implementation libs.typesafe.config
 
     implementation libs.chimp.jsocks
     implementation libs.chimp.jtorctl

network/tor/src/main/java/bisq/tor/TorServiceConfig.java

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.tor;
+
+import com.typesafe.config.Config;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+public class TorServiceConfig {
+
+    public static TorServiceConfig from(Config config) {
+        Map<String, String> torrcOverrideConfigMap = new HashMap<>();
+        Config torrcOverrides = config.getConfig("torrc_overrides");
+        torrcOverrides.entrySet()
+                .forEach(entry -> torrcOverrideConfigMap.put(
+                        entry.getKey(), (String) entry.getValue().unwrapped()
+                ));
+        return new TorServiceConfig(torrcOverrideConfigMap);
+    }
+
+    private final Map<String, String> torrcOverrides;
+
+    public TorServiceConfig(Map<String, String> torrcOverrides) {
+        this.torrcOverrides = torrcOverrides;
+    }
+}

oracle_node_app/src/main/resources/oracle_node.conf

@@ -109,6 +109,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
+                torrc_overrides = {}
                 socketTimeout = 120
             }
             i2p { 

rest_api_app/src/main/resources/rest_api.conf

@@ -102,7 +102,8 @@ application {
             clear { 
                 socketTimeout = 120
             }
-            tor { 
+            tor {
+                torrc_overrides = {}
                 socketTimeout = 120
             }
             i2p { 

seed_node_app/src/main/resources/seed_node.conf

@@ -89,6 +89,7 @@ application {
                 socketTimeout = 120
             }
             tor { 
+                torrc_overrides = {}
                 socketTimeout = 120
             }
             i2p {