Merge pull request 'main' (#42) from SovereigntyIsNotFreedom/darknet-lantern:main into main

Reviewed-on: http://git.nowherejezfoltodf4jiyl6r56jnzintap5vyjlia7fkirfsnfizflqd.onion/nihilist/darknet-lantern/pulls/42

.gitignore

@@ -1,4 +1,5 @@
 .git
 www/participants/**
 scripts/__pycache__/**
-
+.env
+env/

SimpleX/.env.sample

@@ -0,0 +1 @@
+WEBSOCKET_PORT=3030

SimpleX/main.py

@@ -1,14 +1,27 @@
 from websockets.sync.client import connect
+from dotenv import load_dotenv
+
 import json
 import random
+import os
 
+script_abs_path = os.path.dirname(os.path.abspath(__file__))
+env_path = os.path.join(script_abs_path+"/.env")
+default_env_path = os.path.join(script_abs_path+"/.env.sample")
+
+if os.path.exists(env_path):
+    load_dotenv(dotenv_path=env_path)
+else:
+    load_dotenv(dotenv_path=default_env_path)
+
+websocket_port = os.getenv("WEBSOCKET_PORT")
 
 
 def is_simplex_link_valid(simplex_link: str) -> bool:
     """
     Connects to the group using the `simplex_link`. If the response contains error False will be returned else True.
     """
-    with connect("ws://localhost:3030") as websocket:
+    with connect(f"ws://localhost:{websocket_port}") as websocket:
         query = f"/c incognito {simplex_link}"
         command = {
             'corrId': f"id{random.randint(0,999999)}",

requirements.txt

@@ -10,3 +10,5 @@ requests==2.32.3
 six==1.17.0
 tzdata==2025.1
 urllib3==2.3.0
+python-dotenv==1.0.1
+websockets==15.0.1

scripts/.env.sample

@@ -0,0 +1,3 @@
+TOR_HOST=socks5h://127.0.0.1
+TOR_PORT=9050
+

scripts/lantern.py

@@ -1,4 +1,5 @@
 from utils import *
+from dotenv import load_dotenv
 
 import os, pwd
 import pandas as pd
@@ -9,11 +10,23 @@ import urllib
 import sys
 
 
+script_abs_path = os.path.dirname(os.path.abspath(__file__))
+env_path = os.path.join(script_abs_path+"/.env")
+default_env_path = os.path.join(script_abs_path+"/.env.sample")
+
+if os.path.exists(env_path):
+    load_dotenv(dotenv_path=env_path)
+else:
+    load_dotenv(dotenv_path=default_env_path)
+
+tor_host = os.getenv("TOR_HOST")
+tor_port = os.getenv("TOR_PORT")
+
 def main():
     #os.system('clear')
     proxies = {
-        'http': 'socks5h://127.0.0.1:9050',
+        'http': f'{tor_host}:{tor_port}',
-        'https': 'socks5h://127.0.0.1:9050'
+        'https': f'{tor_host}:{tor_port}'
     }
 
     rootpath='/srv/darknet-lantern/'
@@ -33,7 +46,7 @@ def main():
 		    # check if the directory exists
             if not os.path.isdir(participantdir):
 			    #if not, create it
-                print("Official participan ",line.strip() , "'s directory doesnt exist, creating it")
+                print("Official participant ",line.strip() , "'s directory doesnt exist, creating it")
                 os.makedirs(participantdir)
 
 
@@ -1193,4 +1206,4 @@ Maintenance:
 
 
 if __name__ == '__main__':
-    main()
+   main()

scripts/uptimechecker.py

@@ -1,3 +1,5 @@
+from dotenv import load_dotenv
+
 import os,re,pwd
 import csv
 import requests
@@ -5,6 +7,20 @@ import json
 import pandas as pd
 import glob
 
+
+
+script_abs_path = os.path.dirname(os.path.abspath(__file__))
+env_path = os.path.join(script_abs_path+"/.env")
+default_env_path = os.path.join(script_abs_path+"/.env.sample")
+
+if os.path.exists(env_path):
+    load_dotenv(dotenv_path=env_path)
+else:
+    load_dotenv(dotenv_path=default_env_path)
+
+tor_host = os.getenv("TOR_HOST")
+tor_port = os.getenv("TOR_PORT")
+
 #apt install python3-pandas python3-requests python3-socks
 
 def main():
@@ -36,8 +52,8 @@ def main():
 			return False
 	
 	proxies = {
-		'http': 'socks5h://127.0.0.1:9050',
+		'http': f'{tor_host}:{tor_port}',
-		'https': 'socks5h://127.0.0.1:9050'
+		'https': f'{tor_host}:{tor_port}'
 	}
 	
 	instancepath=rootpath+'www/participants/'+instance+'/'