From 92868560898125ef0ae30efb9b82227a06577fff Mon Sep 17 00:00:00 2001
From: Loren Eteval <loren.eteval@proton.me>
Date: Wed, 30 Aug 2023 23:41:42 +0800
Subject: [PATCH] Fix default socks & http tunnel port for Tor CLI

Signed-off-by: Loren Eteval <loren.eteval@proton.me>
---
 Furious/Action/Connect.py  | 11 +++++++----
 Furious/Utility/Utility.py | 12 +++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Furious/Action/Connect.py b/Furious/Action/Connect.py
index cd31ae0..6cb7032 100644
--- a/Furious/Action/Connect.py
+++ b/Furious/Action/Connect.py
@@ -6,7 +6,12 @@
 from Furious.Gui.Action import Action
 from Furious.Widget.ConnectingProgressBar import ConnectingProgressBar
 from Furious.Widget.Widget import MessageBox
-from Furious.Utility.Constants import APP, APPLICATION_NAME, PROXY_SERVER_BYPASS
+from Furious.Utility.Constants import (
+    APP,
+    APPLICATION_NAME,
+    PROXY_SERVER_BYPASS,
+    DEFAULT_TOR_HTTPS_PORT,
+)
 from Furious.Utility.Utility import (
     Switch,
     SupportConnectedCallback,
@@ -605,9 +610,7 @@ def fixLoggingRelativePath(attr):
 
     def startTorRelay(self, core, proxyServer, startCounter=0, step=1):
         # Redirect Proxy
-        self.proxyServer = (
-            f'127.0.0.1:{self.torRelayStorageObj.get("httpsTunnelPort", 9049)}'
-        )
+        self.proxyServer = f'127.0.0.1:{self.torRelayStorageObj.get("httpsTunnelPort", DEFAULT_TOR_HTTPS_PORT)}'
 
         try:
             timeout = 1000 * int(
diff --git a/Furious/Utility/Utility.py b/Furious/Utility/Utility.py
index 6a764b3..4838a5b 100644
--- a/Furious/Utility/Utility.py
+++ b/Furious/Utility/Utility.py
@@ -1,5 +1,11 @@
 from Furious.Gui.Icon import Icon
-from Furious.Utility.Constants import APP, PLATFORM, ROOT_DIR
+from Furious.Utility.Constants import (
+    APP,
+    PLATFORM,
+    ROOT_DIR,
+    DEFAULT_TOR_SOCKS_PORT,
+    DEFAULT_TOR_HTTPS_PORT,
+)
 
 from PySide6 import QtCore
 from PySide6.QtWidgets import QApplication
@@ -123,8 +129,8 @@ def clear():
 
 class TorRelaySettingsStorage:
     EMPTY_OBJECT = {
-        'socksTunnelPort': 9050,
-        'httpsTunnelPort': 9049,
+        'socksTunnelPort': DEFAULT_TOR_SOCKS_PORT,
+        'httpsTunnelPort': DEFAULT_TOR_HTTPS_PORT,
         'useProxy': True,
         'logLevel': 'notice',
         'relayEstablishTimeout': 15,