feat(opnsense): синхронизировать подписки Xray через API плагина os-xray
ansible-core-mon / deploy (push) Successful in 26s
ansible-core-net / deploy (push) Successful in 52s
ansible-core-secrets / deploy (push) Successful in 16s
ansible-ger-nod-02 / deploy (push) Successful in 1m21s
ansible-opnsense / deploy (push) Failing after 5s
ansible-rus-central / deploy (push) Successful in 51s

- роль opnsense/xray: instances.yml как источник правды, ссылки vless://
  из Infisical /services/opnsense-xray, конвертер в outbound_config,
  переключение активной подписки с validate/testconnect и откатом
- deploy-machine.sh: выгрузка /services/opnsense-xray для машины opnsense
- временный workflow xray-secrets-seed для первичного сидинга ссылок
This commit is contained in:
karpenok committed 2026-11-12 21:26:56 +07:00
1 parent 32194a55a1
commit 21f106993f
7 files changed
+472

No files matched your search

+90
View File
@@ -0,0 +1,90 @@
#!/usr/bin/env python3
"""Конвертер vless:// ссылки в outbound JSON для os-xray (outbound_config).
Ссылка читается из argv[1] или stdin. Результат — компактный JSON одного
outbound-объекта (protocol vless), совместимый с xray-core.
Поддерживает: transports xhttp/ws/grpc/tcp/h2/kcp, security reality/tls/none.
Отличие от import/parse плагина: сохраняет extra (xmux и пр.) для xhttp
и не добавляет пустые поля (flow, spiderX), чтобы конфиг не менялся молча.
"""
import json
import sys
from urllib.parse import unquote, urlparse, parse_qs
def main() -> None:
link = sys.argv[1] if len(sys.argv) > 1 else sys.stdin.read()
link = link.strip().strip("\"'")
if not link.startswith("vless://"):
sys.exit("error: link must start with vless://")
parsed = urlparse(link)
uuid = parsed.username
host = parsed.hostname
port = parsed.port
params = {k: v[0] for k, v in parse_qs(parsed.query).items()}
if not uuid or not host or not port:
sys.exit("error: link must look like vless://uuid@host:port?...")
network = params.get("type", "tcp")
security = params.get("security", "reality")
user = {"id": uuid, "encryption": params.get("encryption", "none")}
flow = params.get("flow", "")
if network == "tcp" and flow:
user["flow"] = flow
outbound = {
"tag": "proxy",
"protocol": "vless",
"settings": {"vnext": [{"address": host, "port": port, "users": [user]}]},
"streamSettings": {"network": network, "security": security},
}
ss = outbound["streamSettings"]
if security == "reality":
ss["realitySettings"] = {
"serverName": params.get("sni", ""),
"fingerprint": params.get("fp", "chrome"),
"publicKey": params.get("pbk", ""),
"shortId": params.get("sid", ""),
}
elif security == "tls":
tls = {"serverName": params.get("sni", ""), "fingerprint": params.get("fp", "chrome")}
if params.get("alpn"):
tls["alpn"] = params["alpn"].split(",")
ss["tlsSettings"] = tls
transport_key = {
"xhttp": "xhttpSettings",
"splithttp": "splithttpSettings",
"ws": "wsSettings",
"grpc": "grpcSettings",
"h2": "httpSettings",
"kcp": "kcpSettings",
"tcp": "tcpSettings",
}.get(network)
if transport_key:
t = {}
for param, field in (("path", "path"), ("host", "host"), ("mode", "mode"),
("serviceName", "serviceName")):
if params.get(param):
t[field] = params[param]
if params.get("extra"):
try:
t["extra"] = json.loads(unquote(params["extra"]))
except json.JSONDecodeError:
sys.exit("error: extra is not valid JSON")
if network == "grpc" and "serviceName" in t:
t = {"serviceName": t["serviceName"]}
if t or network == "grpc":
ss[transport_key] = t
json.dump(outbound, sys.stdout, separators=(",", ":"), ensure_ascii=False)
sys.stdout.write("\n")
if __name__ == "__main__":
main()