revert: roll back IPv6 cascade and rus-central remnanode to IPv4 setup
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 3s
ansible-deploy / deploy (core-net, ) (push) Failing after 32s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 4m21s
ansible-deploy / deploy (opnsense, ) (push) Failing after 13s
ansible-deploy / deploy (rus-central, ) (push) Successful in 1m31s
ansible-deploy / plan (push) Successful in 2s
ansible-lint / lint (push) Successful in 3s
ansible-deploy / deploy (core-net, ) (push) Failing after 32s
ansible-deploy / deploy (ger-nod-02, ) (push) Successful in 4m21s
ansible-deploy / deploy (opnsense, ) (push) Failing after 13s
ansible-deploy / deploy (rus-central, ) (push) Successful in 1m31s
This commit is contained in:
1 parent
571f5cb169
commit
f218ca85e1
13 files changed
+42
-381
No files matched your search
@@ -15,20 +15,8 @@ nodes:
|
||||
country_code: "DE"
|
||||
profile_name: "DE-Yali"
|
||||
profile_template: "profile-selfsteal-xhttp.json"
|
||||
inbound_tag: "Cascade-RU-DE"
|
||||
create_host: false
|
||||
inbound_tag: "Steal-Yali"
|
||||
selfsteal_domain: "yali.gunis.top"
|
||||
xhttp_path: "/xhttp-yali"
|
||||
host_remark: "🇩🇪 ger-nod-02"
|
||||
|
||||
- name: Rus-central
|
||||
address: "31.177.108.210"
|
||||
port: 2222
|
||||
country_code: "RU"
|
||||
profile_name: "RU-Cascade"
|
||||
profile_template: "profile-cascade-ru.json"
|
||||
inbound_tag: "Steal-Lulu"
|
||||
selfsteal_domain: "lulu.gunihome.ru"
|
||||
xhttp_path: "/xhttp-lulu"
|
||||
host_remark: "🇷🇺→🇩🇪 lulu"
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
{
|
||||
"log": {
|
||||
"loglevel": "warning"
|
||||
},
|
||||
"dns": {
|
||||
"servers": [
|
||||
{
|
||||
"address": "https://dns.google/dns-query",
|
||||
"skipFallback": false
|
||||
}
|
||||
],
|
||||
"queryStrategy": "UseIP"
|
||||
},
|
||||
"inbounds": [
|
||||
{
|
||||
"tag": "__INBOUND_TAG__",
|
||||
"listen": "31.177.108.210",
|
||||
"port": 443,
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"clients": [],
|
||||
"decryption": "none"
|
||||
},
|
||||
"sniffing": {
|
||||
"enabled": true,
|
||||
"destOverride": ["http", "tls", "quic"]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "xhttp",
|
||||
"security": "reality",
|
||||
"xhttpSettings": {
|
||||
"host": "__SELFSTEAL_DOMAIN__",
|
||||
"mode": "stream-one",
|
||||
"path": "__XHTTP_PATH__"
|
||||
},
|
||||
"realitySettings": {
|
||||
"dest": "/dev/shm/nginx.sock",
|
||||
"show": false,
|
||||
"xver": 1,
|
||||
"spiderX": "",
|
||||
"shortIds": ["__REALITY_SHORT_ID__"],
|
||||
"privateKey": "__REALITY_PRIVATE_KEY__",
|
||||
"serverNames": ["__SELFSTEAL_DOMAIN__"]
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"outbounds": [
|
||||
{
|
||||
"tag": "CASCADE-DE",
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"vnext": [
|
||||
{
|
||||
"address": "2a12:bec4:1bb0:2e80::2",
|
||||
"port": 443,
|
||||
"users": [
|
||||
{
|
||||
"id": "__CASCADE_UUID__",
|
||||
"encryption": "none",
|
||||
"flow": "xtls-rprx-vision"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"serverName": "yali.gunis.top",
|
||||
"fingerprint": "chrome",
|
||||
"publicKey": "__CASCADE_PUBLIC_KEY__",
|
||||
"shortId": "__CASCADE_SHORT_ID__"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"tag": "BLOCK",
|
||||
"protocol": "blackhole"
|
||||
}
|
||||
],
|
||||
"routing": {
|
||||
"domainStrategy": "AsIs",
|
||||
"rules": [
|
||||
{
|
||||
"type": "field",
|
||||
"ip": ["geoip:private"],
|
||||
"outboundTag": "BLOCK"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"protocol": ["bittorrent"],
|
||||
"outboundTag": "BLOCK"
|
||||
},
|
||||
{
|
||||
"type": "field",
|
||||
"network": "tcp,udp",
|
||||
"outboundTag": "CASCADE-DE"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import re
|
||||
import secrets
|
||||
import subprocess
|
||||
import sys
|
||||
import uuid
|
||||
from typing import Any
|
||||
|
||||
|
||||
@@ -178,136 +177,12 @@ def sync_xray_template(
|
||||
return tpl_uuid
|
||||
|
||||
|
||||
def generate_x25519(api: RemnawaveAPI) -> tuple[str, str]:
|
||||
_, key_resp = api.request("GET", "/system/tools/x25519/generate")
|
||||
resp_obj = key_resp.get("response") or key_resp
|
||||
keypairs = resp_obj.get("keypairs") or []
|
||||
first = keypairs[0] if keypairs else resp_obj
|
||||
priv = first.get("privateKey") or first.get("privKey") or ""
|
||||
pub = first.get("publicKey") or first.get("pubKey") or ""
|
||||
if not priv or not pub:
|
||||
raise RuntimeError("Не удалось сгенерировать X25519 ключ Reality")
|
||||
return priv, pub
|
||||
|
||||
|
||||
def ensure_cascade_credentials(
|
||||
api: RemnawaveAPI,
|
||||
changes: list[str],
|
||||
) -> dict[str, str]:
|
||||
"""Ensure DE-Yali has Cascade-RU-DE inbound and return credentials if RU-Cascade needs creation."""
|
||||
_, profiles_resp = api.request("GET", "/config-profiles/")
|
||||
profiles = _extract_list(profiles_resp, "configProfiles")
|
||||
de_prof = next((p for p in profiles if p.get("name") == "DE-Yali"), None)
|
||||
ru_prof = next((p for p in profiles if p.get("name") == "RU-Cascade"), None)
|
||||
if not de_prof:
|
||||
return {}
|
||||
|
||||
de_uuid = de_prof["uuid"]
|
||||
_, de_full = api.request("GET", f"/config-profiles/{de_uuid}")
|
||||
de_obj = de_full.get("response") or de_full
|
||||
de_cfg = de_obj.get("config") or {}
|
||||
inbounds = de_cfg.get("inbounds") or []
|
||||
has_cascade_inb = any(
|
||||
i.get("tag") == "Cascade-RU-DE"
|
||||
and i.get("port") == 443
|
||||
and ((i.get("streamSettings") or {}).get("realitySettings") or {}).get("dest") == "/dev/shm/nginx.sock"
|
||||
for i in inbounds
|
||||
)
|
||||
has_steal_yali = any(i.get("tag") == "Steal-Yali" for i in inbounds)
|
||||
|
||||
ru_ok = False
|
||||
if ru_prof:
|
||||
_, ru_full = api.request("GET", f"/config-profiles/{ru_prof['uuid']}")
|
||||
ru_cfg = (ru_full.get("response") or ru_full).get("config") or {}
|
||||
for ob in ru_cfg.get("outbounds") or []:
|
||||
if ob.get("tag") == "CASCADE-DE":
|
||||
vnext = (ob.get("settings") or {}).get("vnext") or []
|
||||
rs = (ob.get("streamSettings") or {}).get("realitySettings") or {}
|
||||
users = (vnext[0].get("users") or [{}]) if vnext else [{}]
|
||||
if (
|
||||
vnext
|
||||
and vnext[0].get("port") == 443
|
||||
and rs.get("serverName") == "yali.gunis.top"
|
||||
and users[0].get("flow") == "xtls-rprx-vision"
|
||||
):
|
||||
ru_ok = True
|
||||
|
||||
if has_cascade_inb and not has_steal_yali and ru_ok:
|
||||
return {}
|
||||
|
||||
_, users_resp = api.request("GET", "/users/")
|
||||
users_list = _extract_list(users_resp, "users")
|
||||
homelab_user = next((u for u in users_list if u.get("username") == "homelab"), None)
|
||||
cascade_uuid = (homelab_user or {}).get("vlessUuid") or str(uuid.uuid4())
|
||||
|
||||
priv, pub = generate_x25519(api)
|
||||
creds = {
|
||||
"uuid": cascade_uuid,
|
||||
"priv": priv,
|
||||
"pub": pub,
|
||||
"short_id": secrets.token_hex(8),
|
||||
}
|
||||
cascade_inbound = {
|
||||
"tag": "Cascade-RU-DE",
|
||||
"listen": "2a12:bec4:1bb0:2e80::2",
|
||||
"port": 443,
|
||||
"protocol": "vless",
|
||||
"settings": {
|
||||
"clients": [{"id": creds["uuid"], "flow": "xtls-rprx-vision"}],
|
||||
"decryption": "none",
|
||||
},
|
||||
"sniffing": {
|
||||
"enabled": True,
|
||||
"destOverride": ["http", "tls", "quic"],
|
||||
},
|
||||
"streamSettings": {
|
||||
"network": "tcp",
|
||||
"security": "reality",
|
||||
"realitySettings": {
|
||||
"dest": "/dev/shm/nginx.sock",
|
||||
"show": False,
|
||||
"xver": 1,
|
||||
"spiderX": "",
|
||||
"shortIds": [creds["short_id"]],
|
||||
"privateKey": creds["priv"],
|
||||
"serverNames": ["yali.gunis.top"],
|
||||
},
|
||||
},
|
||||
}
|
||||
new_inbounds = [
|
||||
i for i in inbounds
|
||||
if i.get("tag") not in ("Cascade-RU-DE", "Steal-Yali")
|
||||
]
|
||||
new_inbounds.append(cascade_inbound)
|
||||
de_cfg["inbounds"] = new_inbounds
|
||||
api.request("PATCH", "/config-profiles/", {"uuid": de_uuid, "config": de_cfg})
|
||||
changes.append("updated profile DE-Yali to IPv6-only SelfSteal Cascade-RU-DE")
|
||||
if ru_prof:
|
||||
_, ru_full = api.request("GET", f"/config-profiles/{ru_prof['uuid']}")
|
||||
ru_cfg = (ru_full.get("response") or ru_full).get("config") or {}
|
||||
for ob in ru_cfg.get("outbounds") or []:
|
||||
if ob.get("tag") == "CASCADE-DE":
|
||||
vnext = (ob.get("settings") or {}).get("vnext") or []
|
||||
if vnext:
|
||||
vnext[0]["port"] = 443
|
||||
vnext[0]["users"][0]["id"] = creds["uuid"]
|
||||
vnext[0]["users"][0]["flow"] = "xtls-rprx-vision"
|
||||
rs = (ob.get("streamSettings") or {}).get("realitySettings") or {}
|
||||
rs["serverName"] = "yali.gunis.top"
|
||||
rs["publicKey"] = creds["pub"]
|
||||
rs["shortId"] = creds["short_id"]
|
||||
api.request("PATCH", "/config-profiles/", {"uuid": ru_prof["uuid"], "config": ru_cfg})
|
||||
changes.append("updated profile RU-Cascade to SelfSteal yali.gunis.top")
|
||||
return creds
|
||||
|
||||
|
||||
def ensure_profile_and_inbound(
|
||||
api: RemnawaveAPI,
|
||||
node_cfg: dict[str, Any],
|
||||
profile_templates: dict[str, str],
|
||||
cascade_creds: dict[str, str],
|
||||
changes: list[str],
|
||||
) -> tuple[str, str, list[str]]:
|
||||
) -> tuple[str, str]:
|
||||
profile_name = node_cfg["profile_name"]
|
||||
inbound_tag = node_cfg["inbound_tag"]
|
||||
|
||||
@@ -320,10 +195,19 @@ def ensure_profile_and_inbound(
|
||||
raw_tpl = profile_templates.get(tpl_key)
|
||||
if not raw_tpl:
|
||||
raise RuntimeError(f"Не найден шаблон профиля {tpl_key}")
|
||||
if isinstance(raw_tpl, dict):
|
||||
raw_tpl = json.dumps(raw_tpl)
|
||||
|
||||
priv, _ = generate_x25519(api)
|
||||
_, key_resp = api.request("GET", "/system/tools/x25519/generate")
|
||||
resp_obj = key_resp.get("response") or key_resp
|
||||
keypairs = resp_obj.get("keypairs") or []
|
||||
priv = (
|
||||
(keypairs[0].get("privateKey") if keypairs else None)
|
||||
or resp_obj.get("privateKey")
|
||||
or resp_obj.get("privKey")
|
||||
or ""
|
||||
)
|
||||
if not priv:
|
||||
raise RuntimeError("Не удалось сгенерировать X25519 ключ Reality")
|
||||
|
||||
short_id = secrets.token_hex(8)
|
||||
rendered = (
|
||||
raw_tpl.replace("__REALITY_PRIVATE_KEY__", priv)
|
||||
@@ -331,9 +215,6 @@ def ensure_profile_and_inbound(
|
||||
.replace("__INBOUND_TAG__", inbound_tag)
|
||||
.replace("__SELFSTEAL_DOMAIN__", node_cfg["selfsteal_domain"])
|
||||
.replace("__XHTTP_PATH__", node_cfg["xhttp_path"])
|
||||
.replace("__CASCADE_UUID__", cascade_creds.get("uuid", ""))
|
||||
.replace("__CASCADE_PUBLIC_KEY__", cascade_creds.get("pub", ""))
|
||||
.replace("__CASCADE_SHORT_ID__", cascade_creds.get("short_id", ""))
|
||||
)
|
||||
_, created = api.request(
|
||||
"POST",
|
||||
@@ -354,13 +235,7 @@ def ensure_profile_and_inbound(
|
||||
inbound_uuid = next((i["uuid"] for i in inbounds if i.get("tag") == inbound_tag), "")
|
||||
if not inbound_uuid:
|
||||
raise RuntimeError(f"Не найден inbound {inbound_tag} в профиле {profile_uuid}")
|
||||
extra_uuids = [
|
||||
i["uuid"]
|
||||
for tag in node_cfg.get("extra_inbound_tags", [])
|
||||
for i in inbounds
|
||||
if i.get("tag") == tag
|
||||
]
|
||||
return profile_uuid, inbound_uuid, extra_uuids
|
||||
return profile_uuid, inbound_uuid
|
||||
|
||||
|
||||
def sync_node_and_host(
|
||||
@@ -368,7 +243,6 @@ def sync_node_and_host(
|
||||
node_cfg: dict[str, Any],
|
||||
profile_uuid: str,
|
||||
inbound_uuid: str,
|
||||
extra_inbound_uuids: list[str],
|
||||
tpl_uuid: str,
|
||||
nb_peers: dict[str, str],
|
||||
netbird_connected: bool,
|
||||
@@ -389,10 +263,9 @@ def sync_node_and_host(
|
||||
nodes = _extract_list(nodes_resp)
|
||||
existing_node = next((n for n in nodes if n.get("name") == node_name), None)
|
||||
|
||||
active_inbounds = [inbound_uuid] + extra_inbound_uuids
|
||||
desired_cp = {
|
||||
"activeConfigProfileUuid": profile_uuid,
|
||||
"activeInbounds": active_inbounds,
|
||||
"activeInbounds": [inbound_uuid],
|
||||
}
|
||||
|
||||
if not existing_node:
|
||||
@@ -422,7 +295,7 @@ def sync_node_and_host(
|
||||
existing_node.get("address") != target_addr
|
||||
or int(existing_node.get("port") or 0) != int(node_cfg["port"])
|
||||
or cur_cp.get("activeConfigProfileUuid") != profile_uuid
|
||||
or set(cur_inbounds) != set(active_inbounds)
|
||||
or cur_inbounds != [inbound_uuid]
|
||||
)
|
||||
if needs_update:
|
||||
payload = {
|
||||
@@ -436,9 +309,6 @@ def sync_node_and_host(
|
||||
api.request("PUT", "/nodes/", payload)
|
||||
changes.append(f"updated node {node_name} ({target_addr})")
|
||||
|
||||
if not node_cfg.get("create_host", True):
|
||||
return
|
||||
|
||||
selfsteal = node_cfg["selfsteal_domain"]
|
||||
_, hosts_resp = api.request("GET", "/hosts/")
|
||||
hosts = _extract_list(hosts_resp)
|
||||
@@ -519,7 +389,7 @@ def cleanup_removed_nodes_and_hosts(
|
||||
desired_nodes: list[dict[str, Any]],
|
||||
changes: list[str],
|
||||
) -> None:
|
||||
desired_domains = {n["selfsteal_domain"] for n in desired_nodes if n.get("create_host", True)}
|
||||
desired_domains = {n["selfsteal_domain"] for n in desired_nodes}
|
||||
desired_node_names = {n["name"] for n in desired_nodes}
|
||||
desired_profile_names = {n["profile_name"] for n in desired_nodes}
|
||||
|
||||
@@ -715,21 +585,17 @@ def main() -> int:
|
||||
changes,
|
||||
)
|
||||
|
||||
cascade_creds = ensure_cascade_credentials(api, changes)
|
||||
|
||||
inbound_uuids: list[str] = []
|
||||
for node_cfg in cfg.get("nodes", []):
|
||||
profile_uuid, inbound_uuid, extra_inbound_uuids = ensure_profile_and_inbound(
|
||||
api, node_cfg, cfg.get("profile_templates", {}), cascade_creds, changes
|
||||
profile_uuid, inbound_uuid = ensure_profile_and_inbound(
|
||||
api, node_cfg, cfg.get("profile_templates", {}), changes
|
||||
)
|
||||
inbound_uuids.append(inbound_uuid)
|
||||
inbound_uuids.extend(extra_inbound_uuids)
|
||||
sync_node_and_host(
|
||||
api,
|
||||
node_cfg,
|
||||
profile_uuid,
|
||||
inbound_uuid,
|
||||
extra_inbound_uuids,
|
||||
tpl_uuid,
|
||||
nb_peers,
|
||||
bool(cfg.get("netbird_connected")),
|
||||
|
||||
Reference in new issue
Block a user