Add Tor requests to plugin

watchtower-plugin/net/http.py

@@ -93,7 +93,7 @@ def send_appointment(tower_id, tower, appointment_dict, signature):
     return response
 
 
-def post_request(data, endpoint, tower_id):
+def post_request(data, endpoint, tower_id, socks_port=9050):
     """
     Sends a post request to the tower.
 
@@ -110,13 +110,24 @@ def post_request(data, endpoint, tower_id):
     """
 
     try:
-        return requests.post(url=endpoint, json=data, timeout=5)
+        if ".onion" in endpoint:
+            proxies = { 
+                'http': f'socks5h://127.0.0.1:{socks_port}',
+                'https': f'socks5h://127.0.0.1:{socks_port}'
+            }
+
+            return requests.post(url=endpoint, json=data, timeout=15, proxies=proxies)
+        else:
+            return requests.post(url=endpoint, json=data, timeout=5)
 
     except ConnectTimeout:
         message = f"Cannot connect to {tower_id}. Connection timeout"
 
     except ConnectionError:
-        message = f"Cannot connect to {tower_id}. Tower cannot be reached"
+        if ".onion" in endpoint:
+            message = f"Cannot connect to {tower_id}. Trying to connect to a Tor onion address. Are you running Tor?"
+        else:
+            message = f"Cannot connect to {tower_id}. Tower cannot be reached"
 
     except (InvalidSchema, MissingSchema, InvalidURL):
         message = f"Invalid URL. No schema, or invalid schema, found (url={endpoint}, tower_id={tower_id})"

watchtower-plugin/requirements.txt

@@ -1,4 +1,5 @@
 pyln-client
+pyln-testing
 requests
 coincurve
 cryptography>=2.8

watchtower-plugin/watchtower.py

@@ -35,6 +35,7 @@
     "APPOINTMENTS_FOLDER_NAME": {"value": "appointment_receipts", "type": str, "path": True},
     "TOWERS_DB": {"value": "towers", "type": str, "path": True},
     "PRIVATE_KEY": {"value": "sk.der", "type": str, "path": True},
+    "SOCKS_PORT": {"value": 9050, "type": int},
 }
 
 
@@ -45,7 +46,7 @@ class WTClient:
     """
     Holds all the data regarding the watchtower client.
 
-    Fires an additional tread to take care of retries.
+    Fires an additional thread to take care of retries.
 
     Args:
         sk (:obj:`PrivateKey): the user private key. Used to sign appointment sent to the towers.
@@ -69,6 +70,7 @@ def __init__(self, sk, user_id, config):
         self.retrier = Retrier(config.get("MAX_RETRIES"), Queue())
         self.config = config
         self.lock = Lock()
+        self.socks_port = config.get("SOCKS_PORT")
 
         # Populate the towers dict with data from the db
         for tower_id, tower_info in self.db_manager.load_all_tower_records().items():
@@ -170,7 +172,7 @@ def register(plugin, tower_id, host=None, port=None):
 
         plugin.log(f"Registering in the Eye of Satoshi (tower_id={tower_id})")
 
-        response = process_post_response(post_request(data, register_endpoint, tower_id))
+        response = process_post_response(post_request(data, register_endpoint, tower_id, socks_port=plugin.wt_client.socks_port))
         available_slots = response.get("available_slots")
         subscription_expiry = response.get("subscription_expiry")
         tower_signature = response.get("subscription_signature")
@@ -234,7 +236,7 @@ def get_appointment(plugin, tower_id, locator):
         get_appointment_endpoint = f"{tower_netaddr}/get_appointment"
         plugin.log(f"Requesting appointment from {tower_id}")
 
-        response = process_post_response(post_request(data, get_appointment_endpoint, tower_id))
+        response = process_post_response(post_request(data, get_appointment_endpoint, tower_id, socks_port=plugin.wt_client.socks_port))
         return response
 
     except (InvalidParameter, TowerConnectionError, TowerResponseError) as e: