From d2c809c2169d4fa7c5bf12d7da4a6b4c6aee6350 Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Sun, 18 Oct 2026 22:05:49 +0300 Subject: [PATCH] =?UTF-8?q?work:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20byedpi=20?= =?UTF-8?q?=D0=B8=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20xray.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 262 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 181 insertions(+), 81 deletions(-) diff --git a/app.py b/app.py index ed86d5b..faea2eb 100644 --- a/app.py +++ b/app.py @@ -40,9 +40,22 @@ AUTH_ENABLED = env_bool("AUTH_ENABLED", True) ADMIN_USER = os.getenv("ADMIN_USER", "admin") ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", "") APP_SECRET = os.getenv("APP_SECRET", secrets.token_urlsafe(48)) -DNSMASQ_TARGET_IP = str( - ipaddress.ip_address(os.getenv("DNSMASQ_TARGET_IP", "192.168.7.251").strip()) +# DNS routing targets. DNSMASQ_TARGET_IP is kept as a compatibility fallback for XRAY. +XRAY_TARGET_IP = str( + ipaddress.ip_address( + os.getenv( + "XRAY_TARGET_IP", + os.getenv("DNSMASQ_TARGET_IP", "192.168.7.251"), + ).strip() + ) ) +BYEDPI_TARGET_IP = str( + ipaddress.ip_address(os.getenv("BYEDPI_TARGET_IP", "192.168.7.252").strip()) +) +DNS_SERVICES = { + "xray": {"label": "XRAY", "ip": XRAY_TARGET_IP}, + "byedpi": {"label": "ByeDPI", "ip": BYEDPI_TARGET_IP}, +} MAX_IMPORT_BYTES = int(os.getenv("MAX_IMPORT_BYTES", str(256 * 1024))) LAN_NETWORKS = [ x.strip() @@ -105,6 +118,8 @@ class DnsRecord: record_id: str domain: str ip: str + service_key: str + service_name: str address_index: int local_indices: tuple[int, ...] ipv6_blocked: bool @@ -282,6 +297,20 @@ def parse_dns_local_indices(managed: list[str]) -> dict[str, list[int]]: return local_indices +def dns_service_for_ip(ip: str) -> tuple[str, str]: + for key, cfg in DNS_SERVICES.items(): + if cfg["ip"] == ip: + return key, cfg["label"] + return "other", f"Другой ({ip})" + + +def validate_dns_service(value: str) -> str: + key = value.strip().lower() + if key not in DNS_SERVICES: + raise ValueError("Неизвестный DNS-сервис. Разрешены XRAY и ByeDPI.") + return key + + def parse_dns_records(managed: list[str]) -> list[DnsRecord]: records: list[DnsRecord] = [] local_indices = parse_dns_local_indices(managed) @@ -290,12 +319,16 @@ def parse_dns_records(managed: list[str]) -> list[DnsRecord]: if not m: continue domain = m.group(1) + ip = m.group(2) + service_key, service_name = dns_service_for_ip(ip) matching_local = tuple(local_indices.get(domain.lower(), [])) records.append( DnsRecord( record_id=_hash_id(line), domain=domain, - ip=m.group(2), + ip=ip, + service_key=service_key, + service_name=service_name, address_index=idx, local_indices=matching_local, ipv6_blocked=bool(matching_local), @@ -313,6 +346,60 @@ def append_dns_lines(managed: list[str], lines: list[str]) -> None: managed.extend(lines) +def upsert_dns_domain(managed: list[str], domain: str, ip: str) -> str: + """Create, repair, or reroute one logical dnsmasq domain entry. + + A logical entry is always the pair: + address=/domain/IP + local=/domain/ + """ + key = domain.lower() + address_matches: list[tuple[int, str]] = [] + local_matches: list[int] = [] + + for idx, line in enumerate(managed): + address_match = DNS_ADDRESS_RE.match(line) + if address_match and address_match.group(1).lower() == key: + address_matches.append((idx, address_match.group(2))) + continue + local_match = DNS_LOCAL_RE.match(line) + if local_match and local_match.group(1).lower() == key: + local_matches.append(idx) + + canonical_address = f"address=/{domain}/{ip}" + canonical_local = f"local=/{domain}/" + already_exact = ( + len(address_matches) == 1 + and len(local_matches) == 1 + and managed[address_matches[0][0]].strip() == canonical_address + and managed[local_matches[0]].strip() == canonical_local + ) + if already_exact: + return "unchanged" + + had_any = bool(address_matches or local_matches) + old_ips = {old_ip for _, old_ip in address_matches} + + filtered: list[str] = [] + for line in managed: + address_match = DNS_ADDRESS_RE.match(line) + local_match = DNS_LOCAL_RE.match(line) + if address_match and address_match.group(1).lower() == key: + continue + if local_match and local_match.group(1).lower() == key: + continue + filtered.append(line) + + append_dns_lines(filtered, [canonical_address, canonical_local]) + managed[:] = filtered + + if not had_any: + return "added" + if old_ips and old_ips != {ip}: + return "rerouted" + return "repaired" + + # ----------------------------------------------------------------------------- # Validation helpers # ----------------------------------------------------------------------------- @@ -337,27 +424,38 @@ def validate_site(value: str) -> str: def validate_upstream(value: str) -> str: value = value.strip() - try: - parsed = urlsplit(value) - except ValueError as exc: - raise ValueError("Invalid upstream URL.") from exc + if not value: + raise ValueError("Upstream не задан.") - if parsed.scheme not in {"http", "https"}: - raise ValueError("Upstream must start with http:// or https://") + # Caddy accepts both full URLs (http://host:port) and network addresses + # without a scheme (for example 127.0.0.1:8000). + has_scheme = "://" in value + try: + parsed = urlsplit(value if has_scheme else f"//{value}") + except ValueError as exc: + raise ValueError("Некорректный upstream.") from exc + + if has_scheme and parsed.scheme not in {"http", "https"}: + raise ValueError("Upstream должен использовать http://, https:// или формат host:port.") if not parsed.hostname: - raise ValueError("Upstream must contain a hostname or IP address.") + raise ValueError("Upstream должен содержать имя хоста или IP-адрес.") if parsed.username or parsed.password: - raise ValueError("Credentials in upstream URL are not allowed.") + raise ValueError("Логин/пароль в upstream не разрешены.") if parsed.path not in {"", "/"} or parsed.query or parsed.fragment: - raise ValueError("Upstream must not contain a path, query, or fragment.") + raise ValueError("Upstream не должен содержать путь, query или fragment.") + try: port = parsed.port except ValueError as exc: - raise ValueError("Invalid upstream port.") from exc - if port is not None and not (1 <= port <= 65535): - raise ValueError("Invalid upstream port.") - return value.rstrip("/") + raise ValueError("Некорректный порт upstream.") from exc + if port is None: + if not has_scheme: + raise ValueError("Для upstream без http:// или https:// необходимо указать порт, например 127.0.0.1:8000.") + elif not (1 <= port <= 65535): + raise ValueError("Некорректный порт upstream.") + + return value.rstrip("/") def validate_comment(value: str) -> str: value = " ".join(value.replace("\r", " ").replace("\n", " ").split()).strip() @@ -601,7 +699,7 @@ def index(): dns_ok=state[4], dns_status=state[5], lan_networks=", ".join(LAN_NETWORKS), - dns_target_ip=DNSMASQ_TARGET_IP, + dns_services=DNS_SERVICES, auth_enabled=AUTH_ENABLED, ) @@ -671,36 +769,38 @@ def dns_add(): require_csrf() try: domain = validate_dns_domain(request.form.get("domain", "")) - ip = DNSMASQ_TARGET_IP + service = validate_dns_service(request.form.get("service", "xray")) + service_cfg = DNS_SERVICES[service] + ip = service_cfg["ip"] + old = read_text_exact(DNSMASQ_CONF) managed = get_managed_lines(old) - records = parse_dns_records(managed) - address_domains = {r.domain.lower() for r in records} - local_domains = set(parse_dns_local_indices(managed)) - key = domain.lower() + result = upsert_dns_domain(managed, domain, ip) - lines_to_add: list[str] = [] - if key not in address_domains: - lines_to_add.append(f"address=/{domain}/{ip}") - if key not in local_domains: - lines_to_add.append(f"local=/{domain}/") - - if not lines_to_add: - raise ValueError( - f"dnsmasq entry for {domain} already exists and IPv6 blocking is already enabled." + if result == "unchanged": + flash( + f"{domain} уже направлен через {service_cfg['label']} ({ip}), IPv6 заблокирован.", + "success", ) + return redirect(url_for("index")) - append_dns_lines(managed, lines_to_add) new = replace_managed_lines(old, managed) ok, message = apply_transaction(DNSMASQ_CONF, old, new, DNSMASQ_VALIDATE_CMD, DNSMASQ_APPLY_CMD) - if ok and len(lines_to_add) == 1: - message = f"Запись {domain} приведена к новой схеме address + local.\n{message}" + if ok: + action = { + "added": "добавлен", + "rerouted": "переключён", + "repaired": "исправлен", + }[result] + message = ( + f"{domain}: {action}; сервис {service_cfg['label']}, IPv4 {ip}, IPv6 заблокирован.\n" + f"{message}" + ) flash(message, "success" if ok else "error") except Exception as exc: flash(str(exc), "error") return redirect(url_for("index")) - @app.post("/dns/delete") def dns_delete(): require_csrf() @@ -751,86 +851,78 @@ def dns_import(): except UnicodeDecodeError as exc: raise ValueError("Файл импорта должен быть в кодировке UTF-8.") from exc - domains: list[str] = [] + entries: list[tuple[str, str]] = [] seen_import: set[str] = set() errors: list[str] = [] for lineno, raw_line in enumerate(imported_text.splitlines(), start=1): line = raw_line.strip() if not line or line.startswith("#"): continue + + parts = [part.strip() for part in line.split(";", 1)] + raw_domain = parts[0] + raw_service = parts[1] if len(parts) == 2 and parts[1] else "xray" try: - domain = validate_dns_domain(line) + domain = validate_dns_domain(raw_domain) + service = validate_dns_service(raw_service) except ValueError: errors.append(f"строка {lineno}: {line}") continue + key = domain.lower() if key not in seen_import: seen_import.add(key) - domains.append(domain) + entries.append((domain, service)) if errors: preview = "; ".join(errors[:8]) if len(errors) > 8: preview += f"; ещё {len(errors) - 8}" - raise ValueError(f"В файле есть некорректные домены: {preview}") - if not domains: + raise ValueError(f"В файле есть некорректные записи: {preview}") + if not entries: raise ValueError("В файле не найдено ни одного домена.") old = read_text_exact(DNSMASQ_CONF) managed = get_managed_lines(old) - records = parse_dns_records(managed) - address_domains = {r.domain.lower() for r in records} - local_domains = set(parse_dns_local_indices(managed)) + added = rerouted = repaired = unchanged = 0 - added = 0 - repaired = 0 - skipped = 0 - for domain in domains: - key = domain.lower() - missing_address = key not in address_domains - missing_local = key not in local_domains - - if not missing_address and not missing_local: - skipped += 1 - continue - - lines_to_add: list[str] = [] - if missing_address: - lines_to_add.append(f"address=/{domain}/{DNSMASQ_TARGET_IP}") - address_domains.add(key) - if missing_local: - lines_to_add.append(f"local=/{domain}/") - local_domains.add(key) - - append_dns_lines(managed, lines_to_add) - if missing_address and missing_local: + for domain, service in entries: + result = upsert_dns_domain(managed, domain, DNS_SERVICES[service]["ip"]) + if result == "added": added += 1 - else: + elif result == "rerouted": + rerouted += 1 + elif result == "repaired": repaired += 1 + else: + unchanged += 1 - if not added and not repaired: - flash(f"Изменений нет. Полностью существующих доменов: {skipped}.", "success") + if not (added or rerouted or repaired): + flash(f"Изменений нет. Без изменений: {unchanged}.", "success") return redirect(url_for("index")) new = replace_managed_lines(old, managed) ok, message = apply_transaction(DNSMASQ_CONF, old, new, DNSMASQ_VALIDATE_CMD, DNSMASQ_APPLY_CMD) if ok: message = ( - f"Импорт завершён: новых доменов {added}, дополнено до address + local {repaired}, " - f"без изменений {skipped}.\n{message}" + f"Импорт завершён: новых {added}, переключено {rerouted}, исправлено {repaired}, " + f"без изменений {unchanged}.\n{message}" ) flash(message, "success" if ok else "error") except Exception as exc: flash(str(exc), "error") return redirect(url_for("index")) - @app.get("/dns/export") def dns_export(): try: text = read_text_exact(DNSMASQ_CONF) records = parse_dns_records(get_managed_lines(text)) - content = "\n".join(r.domain for r in records) + lines: list[str] = [] + for r in records: + service = r.service_name if r.service_key != "other" else r.ip + lines.append(f"{r.domain};{service}") + content = "\n".join(lines) if content: content += "\n" return Response( @@ -874,8 +966,8 @@ TEMPLATE = r""" .dot.ok { background:var(--good); box-shadow:0 0 0 3px rgba(53,196,106,.12); } form.add { display:grid; grid-template-columns:1fr 1fr; gap:10px; padding:13px; margin-bottom:16px; background:#12161c; border:1px solid var(--line); border-radius:11px; } label { display:block; color:var(--muted); font-size:12px; } - input[type=text] { width:100%; margin-top:5px; padding:9px 10px; border-radius:8px; border:1px solid #343b47; background:#0e1116; color:#fff; outline:none; } - input[type=text]:focus { border-color:var(--accent); } + input[type=text], select { width:100%; margin-top:5px; padding:9px 10px; border-radius:8px; border:1px solid #343b47; background:#0e1116; color:#fff; outline:none; } + input[type=text]:focus, select:focus { border-color:var(--accent); } .wide { grid-column:1/-1; } .check { display:flex; gap:8px; align-items:center; color:#dce3eb; } button { border:0; border-radius:8px; padding:9px 12px; color:#fff; background:var(--accent); cursor:pointer; font-weight:600; } @@ -917,7 +1009,7 @@ TEMPLATE = r"""
- + @@ -952,24 +1044,32 @@ TEMPLATE = r""" - -
Для каждого домена создаются две строки: address → {{ dns_target_ip }} и local для блокировки внешнего IPv6.
- + + +
XRAY → {{ dns_services['xray']['ip'] }}, ByeDPI → {{ dns_services['byedpi']['ip'] }}. Для домена также создаётся local= для блокировки внешнего IPv6.
+
- +

Экспортировать список доменов

- + {% for r in dns_records %} + - {% else %}{% endfor %} + {% else %}{% endfor %}
DomainIPv4IPv6
DomainСервисIPv4IPv6
{{ r.domain }}{{ r.service_name }} {{ r.ip }} {% if r.ipv6_blocked %}заблокирован{% else %}нет local={% endif %} @@ -980,7 +1080,7 @@ TEMPLATE = r"""
Записей не найдено.
Записей не найдено.
Результат dnsmasq --test
{{ dns_status }}