Disable SSL switch

ui/ctk_tray_ui.py

@@ -44,19 +44,21 @@ _CFWORKER_TEST_DST = {
 }
 
 
-def _run_connectivity_test(cases: list) -> dict:
+def _run_connectivity_test(cases: list, *, secure: bool = True) -> dict:
     import base64
+    from contextlib import nullcontext
     import ssl
     import socket as _socket
 
-    ctx = ssl.create_default_context()
-    ctx.check_hostname = False
-    ctx.verify_mode = ssl.CERT_NONE
+    ctx = ssl.create_default_context() if secure else None
+    port = 443 if secure else 80
     results = {}
     for dc, connect_host, sni_host, req_host, path in cases:
         try:
-            with _socket.create_connection((connect_host, 443), timeout=5) as raw:
-                with ctx.wrap_socket(raw, server_hostname=sni_host) as ssock:
+            with _socket.create_connection((connect_host, port), timeout=5) as raw:
+                connection = (ctx.wrap_socket(raw, server_hostname=sni_host)
+                              if secure else nullcontext(raw))
+                with connection as ssock:
                     ws_key = base64.b64encode(os.urandom(16)).decode()
                     req = (
                         f"GET {path} HTTP/1.1\r\n"
@@ -91,36 +93,36 @@ def _run_connectivity_test(cases: list) -> dict:
     return results
 
 
-def _run_cfproxy_connectivity_test(domain: str) -> dict:
+def _run_cfproxy_connectivity_test(domain: str, *, secure: bool = True) -> dict:
     cases = []
     for dc in _CFPROXY_TEST_DCS:
         host = f"kws{dc}.{domain}"
         cases.append((dc, host, host, host, "/apiws"))
-    return _run_connectivity_test(cases)
+    return _run_connectivity_test(cases, secure=secure)
 
 
-def _run_cfworker_connectivity_test(domain: str) -> dict:
+def _run_cfworker_connectivity_test(domain: str, *, secure: bool = True) -> dict:
     cases = []
     for dc in _CFPROXY_TEST_DCS:
         dst = _CFWORKER_TEST_DST[dc]
         path = f"/apiws?dst={dst}&dc={dc}&media=0"
         cases.append((dc, domain, domain, domain, path))
-    return _run_connectivity_test(cases)
+    return _run_connectivity_test(cases, secure=secure)
 
 
-def _run_cfproxy_multi_test(domains: list) -> dict:
-    return {domain: _run_cfproxy_connectivity_test(domain) for domain in domains}
+def _run_cfproxy_multi_test(domains: list, *, secure: bool = True) -> dict:
+    return {domain: _run_cfproxy_connectivity_test(domain, secure=secure) for domain in domains}
 
 
-def _run_cfworker_multi_test(domains: list) -> dict:
-    return {domain: _run_cfworker_connectivity_test(domain) for domain in domains}
+def _run_cfworker_multi_test(domains: list, *, secure: bool = True) -> dict:
+    return {domain: _run_cfworker_connectivity_test(domain, secure=secure) for domain in domains}
 
 
-def _run_cfproxy_auto_test(domains: list) -> tuple:
+def _run_cfproxy_auto_test(domains: list, *, secure: bool = True) -> tuple:
     merged: dict = {}
     best_domain = None
     for domain in reversed(domains):
-        res = _run_cfproxy_connectivity_test(domain)
+        res = _run_cfproxy_connectivity_test(domain, secure=secure)
         if all(v is True for v in res.values()):
             return domain, res
         for dc, v in res.items():
@@ -350,6 +352,7 @@ class TrayConfigFormWidgets:
     secret_var: Any
     dc_textbox: Any
     verbose_var: Any
+    no_secure_var: Any
     adv_entries: List[Any]
     adv_keys: Tuple[str, ...]
     autostart_var: Optional[Any]
@@ -536,6 +539,7 @@ def install_tray_config_form(
     _cf_test_btn = [None]
 
     def _on_cf_test():
+        secure = not no_secure_var.get()
         user_domains = (
             coerce_domain_list(cfproxy_user_domain_var.get())
             if cf_custom_cb_var.get() else []
@@ -547,7 +551,7 @@ def install_tray_config_form(
         if user_domains:
             def _worker():
                 try:
-                    per = _run_cfproxy_multi_test(user_domains)
+                    per = _run_cfproxy_multi_test(user_domains, secure=secure)
                     if btn:
                         btn.after(
                             0,
@@ -564,7 +568,7 @@ def install_tray_config_form(
         else:
             def _worker_auto():
                 try:
-                    ok_domain, res = _run_cfproxy_auto_test(balancer.domains)
+                    ok_domain, res = _run_cfproxy_auto_test(balancer.domains, secure=secure)
                     if btn:
                         btn.after(
                             0,
@@ -672,6 +676,7 @@ def install_tray_config_form(
         btn.configure(state="normal" if enabled else "disabled")
 
     def _on_cfworker_test():
+        secure = not no_secure_var.get()
         domains = coerce_domain_list(cfproxy_worker_domain_var.get())
         btn = _cfworker_test_btn[0]
         if not cfproxy_worker_enabled_var.get() or not domains or btn is None:
@@ -681,7 +686,7 @@ def install_tray_config_form(
 
         def _worker():
             try:
-                per = _run_cfworker_multi_test(domains)
+                per = _run_cfworker_multi_test(domains, secure=secure)
                 btn.after(
                     0,
                     lambda: _show_multi_connectivity_results(
@@ -730,6 +735,11 @@ def install_tray_config_form(
     verbose_cb.pack(anchor="w", pady=(0, 6))
     attach_ctk_tooltip(verbose_cb, t("tip.verbose"))
 
+    no_secure_var = ctk.BooleanVar(value=cfg.get("no_secure", False))
+    no_secure_cb = _checkbox(ctk, log_inner, theme, t("label.no_secure"), no_secure_var)
+    no_secure_cb.pack(anchor="w", pady=(0, 6))
+    attach_ctk_tooltip(no_secure_cb, t("tip.no_secure"))
+
     adv_frame = ctk.CTkFrame(log_inner, fg_color="transparent")
     adv_frame.pack(fill="x")
 
@@ -823,7 +833,7 @@ def install_tray_config_form(
 
     return TrayConfigFormWidgets(
         host_var=host_var, port_var=port_var, secret_var=secret_var,
-        dc_textbox=dc_textbox, verbose_var=verbose_var,
+        dc_textbox=dc_textbox, verbose_var=verbose_var, no_secure_var=no_secure_var,
         adv_entries=adv_entries, adv_keys=adv_keys,
         autostart_var=autostart_var, check_updates_var=check_updates_var,
         cfproxy_var=cfproxy_var,
@@ -935,6 +945,8 @@ def validate_config_form(
         new_cfg["appearance"] = _appearance_to_cfg(widgets.appearance_var.get())
     if widgets.language_var is not None:
         new_cfg["language"] = language_from_label(widgets.language_var.get()).value
+    if widgets.no_secure_var is not None:
+        new_cfg["no_secure"] = bool(widgets.no_secure_var.get())
     return new_cfg
 
 

ui/i18n/en.json

@@ -32,6 +32,7 @@
   "label.cf_custom_domain": "Custom domain",
   "label.cfworker_domains": "Cloudflare Worker domains (comma-separated)",
   "label.verbose": "Verbose logging",
+  "label.no_secure": "Disable SSL for CF-proxy and CF-worker",
   "label.buf_kb": "Buffer, KB (default 256)",
   "label.pool_size": "WebSocket session pool (default 4)",
   "label.log_max_mb": "Max log size, MB (default 5)",
@@ -44,6 +45,7 @@
   "tip.secret": "Secret key for client authorization",
   "tip.dc": "Mapping of Telegram data center (DC) number to web.telegram.org dc server IP.\nEach line: «number:IP», e.g. 4:149.154.167.220. The proxy routes traffic to Telegram servers using these rules\n\nIf connection fails then fallbacks are used",
   "tip.verbose": "When enabled, more details are written to the log file — useful for troubleshooting",
+  "tip.no_secure": "When enabled, the proxy will use port 80 for CF-proxy and CF-worker connections",
   "tip.buf_kb": "Receive/send buffer size in kilobytes.\nA larger value allocates more memory per socket",
   "tip.pool": "How many parallel WebSocket sessions per data center can be kept open.\nIncreasing may help under high load",
   "tip.log_mb": "Maximum log file size; the file is overwritten when the limit is reached",

ui/i18n/ru.json

@@ -32,6 +32,7 @@
   "label.cf_custom_domain": "Свой домен",
   "label.cfworker_domains": "Cloudflare Worker домены (через запятую)",
   "label.verbose": "Подробное логирование (verbose)",
+  "label.no_secure": "Выключиь SSL для CF-прокси и CF-worker",
   "label.buf_kb": "Буфер, КБ (по умолчанию 256)",
   "label.pool_size": "Пул WebSocket-сессий (по умолчанию 4)",
   "label.log_max_mb": "Макс. размер лога, МБ (по умолчанию 5)",
@@ -44,6 +45,7 @@
   "tip.secret": "Секретный ключ для авторизации клиентов",
   "tip.dc": "Соответствие номера датацентра Telegram (DC) и IP-адреса сервера.\nКаждая строка: «номер:IP», например 4:149.154.167.220. Прокси по этим правилам направляет трафик к нужным серверам Telegram\n\nЕсли у вас не работают медиа и работает CF-прокси, то попробуйте убрать строку 2:149.154.167.220",
   "tip.verbose": "Если включено, в файл логов пишется больше подробностей — необходимо при поиске неполадок",
+  "tip.no_secure": "Если включено, прокси будет использовать 80 порт для CF-прокси и CF-worker подключений",
   "tip.buf_kb": "Размер буфера приёма/передачи в килобайтах.\nБольше значение — больше выделение памяти на сокет",
   "tip.pool": "Сколько параллельных WebSocket-сессий к одному датацентру можно держать.\nУвеличение может помочь при высокой нагрузке",
   "tip.log_mb": "Максимальный размер файла лога; при достижении лимита файл перезаписывается",