From 899e8092da6e668ab79646954c018afbd0e538e2 Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Thu, 29 Oct 2026 22:36:00 +0300 Subject: [PATCH] =?UTF-8?q?work:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=20=D0=BF=D0=BE=20?= =?UTF-8?q?stadidisk.local.=20=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=B8=D0=BC=D0=BF=D1=80=D0=BE=D1=82=D0=B8=D1=80=D1=83=D1=8E?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?= =?UTF-8?q?=D1=82=D0=B5=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BF=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=81=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D0=BD=D0=B0?= =?UTF-8?q?=20nas=20(stadidisk.local)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.conf | 1 + service_functions.py | 99 +++++++++++++++++++++++++++----------------- 2 files changed, 63 insertions(+), 37 deletions(-) diff --git a/config.conf b/config.conf index d06e2b1..bbabc56 100644 --- a/config.conf +++ b/config.conf @@ -6,6 +6,7 @@ wud.stadidisk.ru [Settings] # Источник списка: list или caddyfile domainsSource=caddyfile +proxyTargetHost=stadidisk.local #Путь к файлу с логином/паролем для авторизации pathToCredentials=/etc/caddy-to-dsm/.secret diff --git a/service_functions.py b/service_functions.py index 512c445..051dd01 100644 --- a/service_functions.py +++ b/service_functions.py @@ -97,20 +97,20 @@ class ServiceFunctions: password=password, ) + def get_caddy_proxy_domains(self, proxy_target_host: str, ssh_host: str) -> list[str]: + """ + Получает домены из Caddyfile, у которых reverse_proxy + направлен на указанный upstream-хост. + """ - def get_caddy_proxy_domains(self,domain_suffix: str) -> list[str]: - """ - Получает список reverse_proxy-доменов с Cudy - через SSH и caddy adapt. - """ - settings = self.load_config() + from urllib.parse import urlsplit command = [ "ssh", "-T", "-o", "BatchMode=yes", "-o", "ConnectTimeout=5", - settings.ssh_host, + ssh_host, "/usr/bin/caddy adapt " "--config /etc/caddy/Caddyfile " "--adapter caddyfile" @@ -131,65 +131,87 @@ class ServiceFunctions: ) from exc config = json.loads(result.stdout) + target = proxy_target_host.strip().lower().rstrip(".") - servers = ( - config.get("apps", {}) - .get("http", {}) - .get("servers", {}) - ) + if not target: + raise ValueError("proxyTargetHost is empty") - def has_reverse_proxy(node): + def is_target_upstream(dial: str) -> bool: + if not isinstance(dial, str): + return False + + address = dial.strip() + + if address.startswith("tcp/"): + address = address[4:] + + try: + parsed = urlsplit( + address if "://" in address + else "//" + address + ) + hostname = (parsed.hostname or "").lower().rstrip(".") + except ValueError: + return False + + return hostname == target + + def has_target_proxy(node) -> bool: if isinstance(node, dict): + if node.get("handler") == "reverse_proxy": - return True + for upstream in node.get("upstreams", []): + if is_target_upstream( + upstream.get("dial", "") + ): + return True + return any( - has_reverse_proxy(value) + has_target_proxy(value) for value in node.values() ) if isinstance(node, list): return any( - has_reverse_proxy(item) + has_target_proxy(item) for item in node ) return False - suffix = domain_suffix.strip().lower().strip(".") - if not suffix: - raise ValueError("domainSuffix is empty") + servers = ( + config.get("apps", {}) + .get("http", {}) + .get("servers", {}) + ) domains = set() for server in servers.values(): for route in server.get("routes", []): - if not has_reverse_proxy( - route.get("handle", []) - ): + if not has_target_proxy(route.get("handle", [])): continue for matcher in route.get("match", []): for host in matcher.get("host", []): host = host.lower().rstrip(".") - if "*" in host: - continue - - if ( - host == suffix - or host.endswith("." + suffix) - ): + if "*" not in host: domains.add(host) if not domains: raise RuntimeError( - "No reverse_proxy domains found in Caddyfile" + f"No reverse_proxy domains found for {target}" ) result_domains = sorted(domains) - logging.info("Caddy proxy domains: %s",", ".join(result_domains)) + logging.info( + "Domains proxied to %s: %s", + target, + ", ".join(result_domains) + ) return result_domains @@ -242,16 +264,19 @@ class ServiceFunctions: # Выбираем источник списка доменов domains_source = config.get("Settings", "domainsSource", fallback="list").strip().lower() - + ssh_host = config.get("Settings", "ssh_host").strip() if domains_source == "caddyfile": - domain_suffix = config.get( + proxy_target_host = config.get( "Settings", - "domainSuffix", + "proxyTargetHost", fallback="stadidisk.local" ) - domains = self.get_caddy_proxy_domains(domain_suffix) + domains = self.get_caddy_proxy_domains( + proxy_target_host, + ssh_host + ) elif domains_source == "list": @@ -281,8 +306,8 @@ class ServiceFunctions: path_to_save_folder = Path(config.get("Settings", "pathToSaveFolder")), nas_url = config.get("Settings", "urlNas"), path_to_remote_ssh_cert=Path(config.get("Settings", "path_to_remote_ssh_cert")), - is_load_cert_from_ssh=bool(config.get("Settings", "is_load_cert_from_ssh")), - ssh_host=config.get("Settings", "ssh_host"), + is_load_cert_from_ssh=config.getboolean("Settings", "is_load_cert_from_ssh"), + ssh_host=ssh_host, path_to_copy_ssh_cert=Path(config.get("Settings", "path_to_copy_ssh_cert")) ) return appl_settings