From ba8c766698022fb68edc62ebc648773d31e22097 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Thu, 16 Oct 2025 13:02:27 +0200
Subject: [PATCH] work

---
 http-host.py      | 42 +++++++++++++++++++++++++-----------------
 ssh_lib/pycurl.py | 13 ++++++++-----
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/http-host.py b/http-host.py
index 55b01dc..c20ca63 100755
--- a/http-host.py
+++ b/http-host.py
@@ -69,30 +69,38 @@ def sync(hostname, user, port, noninteractive):
 @cli.command()
 def debug():
     config_data = read_jsonc()
-
-    area = 'monaco' if config_data['skip_planet'] else 'planet'
+    area = 'monaco' if config_data.get('skip_planet') else 'planet'
     version = get_deployed_version(area)['version']
-
     domains = [d['domain'] for d in config_data['domains']]
+    servers = [
+        {'hostname': s['hostname'], 'ip': get_ip_from_ssh_alias(s['hostname'])}
+        for s in config_data['servers']
+    ]
 
-    servers = []
+    for server in servers:
+        print(f'SERVER {server["hostname"]} ({server["ip"]})')
+        server_ok = True
 
-    for s in config_data['servers']:
-        hostname = s['hostname']
-        ip = get_ip_from_ssh_alias(hostname)
-        servers.append(dict(hostname=hostname, ip=ip))
+        for domain in domains:
+            try:
+                check_host_using_tilejson(
+                    url=f'https://{domain}/{area}/{version}',
+                    ip=server['ip'],
+                    version=version,
+                )
+                print(f'  {domain}     OK')
+            except AssertionError:
+                print(f'  {domain}     FAILED - Version mismatch (expected {version})')
+                server_ok = False
+            except Exception as e:
+                print(f'  {domain}     FAILED - {e}')
+                server_ok = False
 
-    for domain in domains:
-        for server in servers:
-            print(domain, server)
-            check_host_using_tilejson(
-                url=f'https://{domain}/{area}/{version}',
-                ip=server['ip'],
-                version=version,
-            )
+        status = 'OK' if server_ok else 'FAILED'
+        print(f'  {status}\n')
 
 
-def check_host_using_tilejson(*, url, ip, version):
+def check_host_using_tilejson(*, url: str, ip: str, version: str) -> None:
     tilejson_str = pycurl_get(url, ip)
     tilejson = json.loads(tilejson_str)
     tiles_url = tilejson['tiles'][0]
diff --git a/ssh_lib/pycurl.py b/ssh_lib/pycurl.py
index 31c76f0..4321bec 100644
--- a/ssh_lib/pycurl.py
+++ b/ssh_lib/pycurl.py
@@ -13,13 +13,12 @@ Example:
 
 How it works:
     Overrides DNS resolution to connect to a specific IP while using the correct
-    hostname for TLS/SNI. This lets you bypass round-robin to test individual servers.
+    hostname for TLS/SNI. Verifies HTTPS is working without validating certificate chain.
 """
 
 from io import BytesIO
 from urllib.parse import urlparse
 
-import certifi
 import pycurl
 
 
@@ -28,6 +27,7 @@ def pycurl_status(url: str, target_ip: str) -> int:
     Check HTTP status of a specific server behind round-robin DNS.
 
     Makes a HEAD request to the target IP while using the hostname for HTTPS/SNI.
+    Verifies HTTPS is configured but does not validate certificate chain.
 
     Args:
         url: Full URL to request (e.g., 'https://api.example.com/health')
@@ -42,7 +42,8 @@ def pycurl_status(url: str, target_ip: str) -> int:
 
     c = pycurl.Curl()
     c.setopt(c.URL, url)
-    c.setopt(c.CAINFO, certifi.where())
+    c.setopt(c.SSL_VERIFYPEER, 0)  # Skip cert validation
+    c.setopt(c.SSL_VERIFYHOST, 0)  # Skip hostname validation
     c.setopt(c.RESOLVE, [f'{hostname}:{port}:{target_ip}'])
     c.setopt(c.NOBODY, True)  # HEAD request
     c.setopt(c.TIMEOUT, 5)
@@ -58,6 +59,7 @@ def pycurl_get(url: str, target_ip: str, binary: bool = False) -> str | bytes:
     Fetch content from a specific server behind round-robin DNS.
 
     Makes a GET request to the target IP while using the hostname for HTTPS/SNI.
+    Verifies HTTPS is configured but does not validate certificate chain.
 
     Args:
         url: Full URL to request (e.g., 'https://api.example.com/data')
@@ -77,7 +79,8 @@ def pycurl_get(url: str, target_ip: str, binary: bool = False) -> str | bytes:
     buffer = BytesIO()
     c = pycurl.Curl()
     c.setopt(c.URL, url)
-    c.setopt(c.CAINFO, certifi.where())
+    c.setopt(c.SSL_VERIFYPEER, 0)  # Skip cert validation
+    c.setopt(c.SSL_VERIFYHOST, 0)  # Skip hostname validation
     c.setopt(c.RESOLVE, [f'{hostname}:{port}:{target_ip}'])
     c.setopt(c.WRITEDATA, buffer)
     c.setopt(c.TIMEOUT, 5)
@@ -89,4 +92,4 @@ def pycurl_get(url: str, target_ip: str, binary: bool = False) -> str | bytes:
         raise ValueError(f'status code: {status_code}')
 
     body = buffer.getvalue()
-    return body if binary else body.decode('utf-8')
+    return body if binary else body.decode('utf-8')
\ No newline at end of file