mirror of
https://github.com/masterking32/MasterHttpRelayVPN.git
synced 2026-05-17 21:24:37 +03:00
Merge branch 'python_testing' into features/google-ip-scanner
This commit is contained in:
@@ -22,6 +22,7 @@ if _SRC_DIR not in sys.path:
|
||||
|
||||
from cert_installer import install_ca, is_ca_trusted
|
||||
from constants import __version__
|
||||
from lan_utils import log_lan_access
|
||||
from google_ip_scanner import scan_sync
|
||||
from logging_utils import configure as configure_logging, print_banner
|
||||
from mitm import CA_CERT_FILE
|
||||
@@ -109,8 +110,31 @@ def main():
|
||||
config = json.load(f)
|
||||
except FileNotFoundError:
|
||||
print(f"Config not found: {config_path}")
|
||||
print("Copy config.example.json to config.json and fill in your values.")
|
||||
sys.exit(1)
|
||||
# Offer the interactive wizard if it's available and we're on a TTY.
|
||||
wizard = os.path.join(os.path.dirname(os.path.abspath(__file__)), "setup.py")
|
||||
if os.path.exists(wizard) and sys.stdin.isatty():
|
||||
try:
|
||||
answer = input("Run the interactive setup wizard now? [Y/n]: ").strip().lower()
|
||||
except EOFError:
|
||||
answer = "n"
|
||||
if answer in ("", "y", "yes"):
|
||||
import subprocess
|
||||
rc = subprocess.call([sys.executable, wizard])
|
||||
if rc != 0:
|
||||
sys.exit(rc)
|
||||
try:
|
||||
with open(config_path) as f:
|
||||
config = json.load(f)
|
||||
except Exception as e:
|
||||
print(f"Could not load config after setup: {e}")
|
||||
sys.exit(1)
|
||||
else:
|
||||
print("Copy config.example.json to config.json and fill in your values,")
|
||||
print("or run: python setup.py")
|
||||
sys.exit(1)
|
||||
else:
|
||||
print("Run: python setup.py (or copy config.example.json to config.json)")
|
||||
sys.exit(1)
|
||||
except json.JSONDecodeError as e:
|
||||
print(f"Invalid JSON in config: {e}")
|
||||
sys.exit(1)
|
||||
@@ -220,6 +244,14 @@ def main():
|
||||
else:
|
||||
log.info("MITM CA is already trusted.")
|
||||
|
||||
# ── LAN sharing configuration ────────────────────────────────────────
|
||||
lan_sharing = config.get("lan_sharing", True)
|
||||
if lan_sharing:
|
||||
# If LAN sharing is enabled and host is still localhost, change to all interfaces
|
||||
if config.get("listen_host", "127.0.0.1") == "127.0.0.1":
|
||||
config["listen_host"] = "0.0.0.0"
|
||||
log.info("LAN sharing enabled — listening on all interfaces")
|
||||
|
||||
log.info("HTTP proxy : %s:%d",
|
||||
config.get("listen_host", "127.0.0.1"),
|
||||
config.get("listen_port", 8080))
|
||||
@@ -228,6 +260,11 @@ def main():
|
||||
config.get("socks5_host", config.get("listen_host", "127.0.0.1")),
|
||||
config.get("socks5_port", 1080))
|
||||
|
||||
# Log LAN access addresses if sharing is enabled
|
||||
if lan_sharing:
|
||||
socks_port = config.get("socks5_port", 1080) if config.get("socks5_enabled", True) else None
|
||||
log_lan_access(config.get("listen_port", 8080), socks_port)
|
||||
|
||||
try:
|
||||
asyncio.run(_run(config))
|
||||
except KeyboardInterrupt:
|
||||
|
||||
Reference in New Issue
Block a user