feat(remnawave): persist Reality keys in Infisical and auto-sync OPNsense VLESS link
This commit is contained in:
1 parent
ef8179e96e
commit
e623faff2b
6 files changed
+131
-4
No files matched your search
@@ -121,6 +121,8 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then
|
||||
ansible/roles/core-net/remnawave/tasks/publish.yml)
|
||||
if [ "$machine" = "core-net" ]; then
|
||||
add_tag remnawave_sync
|
||||
elif [ "$machine" = "opnsense" ]; then
|
||||
add_tag xray
|
||||
fi
|
||||
;;
|
||||
ansible/roles/"$machine"/.ci-trigger)
|
||||
|
||||
@@ -75,6 +75,7 @@ case "$machine" in
|
||||
extra+=(-e "traefik_dashboard_auth=${TRAEFIK_DASHBOARD_AUTH}")
|
||||
fi
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/remnawave" --format=dotenv-export --silent 2>/dev/null || true)"
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/opnsense-xray" --format=dotenv-export --silent 2>/dev/null || true)"
|
||||
export REMNAWAVE_ADMIN_USER="${REMNAWAVE_ADMIN_USER:-${ADMIN_USER:-karpenok}}"
|
||||
export REMNAWAVE_ADMIN_PASSWORD="${REMNAWAVE_ADMIN_PASSWORD:-}"
|
||||
export REMNAWAVE_APP_SECRET="${REMNAWAVE_APP_SECRET:-}"
|
||||
@@ -83,6 +84,8 @@ case "$machine" in
|
||||
export REMNAWAVE_WEBHOOK_SECRET_HEADER="${REMNAWAVE_WEBHOOK_SECRET_HEADER:-}"
|
||||
export REMNAWAVE_API_TOKEN="${REMNAWAVE_API_TOKEN:-}"
|
||||
export REMNANODE_SECRET_KEY="${REMNANODE_SECRET_KEY:-}"
|
||||
export REMNAWAVE_REALITY_PRIVATE_KEY="${REMNAWAVE_REALITY_PRIVATE_KEY:-}"
|
||||
export REMNAWAVE_REALITY_SHORT_ID="${REMNAWAVE_REALITY_SHORT_ID:-}"
|
||||
;;
|
||||
core-secrets)
|
||||
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/infisical" --format=dotenv-export --silent)"
|
||||
|
||||
@@ -30,3 +30,4 @@ nodes:
|
||||
country_code: DE
|
||||
profile: DE-Yali
|
||||
host_remark: "🇩🇪 ger-nod-02"
|
||||
opnsense_secret: GERM_02
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import copy
|
||||
import json
|
||||
import os
|
||||
@@ -10,6 +11,7 @@ import re
|
||||
import secrets
|
||||
import subprocess
|
||||
import sys
|
||||
import urllib.parse
|
||||
from typing import Any
|
||||
|
||||
|
||||
@@ -167,6 +169,9 @@ class Sync:
|
||||
self.refs: dict[str, dict[str, dict[str, Any]]] = {}
|
||||
self.inbounds: dict[str, dict[str, Any]] = {}
|
||||
self.xray_url = ""
|
||||
self.reality_private_key = ""
|
||||
self.reality_short_id = ""
|
||||
self.opnsense_links: dict[str, str] = {}
|
||||
|
||||
def run(self) -> dict[str, Any]:
|
||||
pending: list[tuple[dict[str, Any], list[dict[str, Any]], set[tuple[Any, ...]]]] = []
|
||||
@@ -179,7 +184,9 @@ class Sync:
|
||||
self._prune(step, remote, keep)
|
||||
for step in later:
|
||||
getattr(self, f"run_{step['run']}")()
|
||||
self._collect_opnsense_links()
|
||||
self._write_xray_url()
|
||||
self._write_sync_secrets()
|
||||
return {"changed": bool(self.changes), "changes": self.changes, "warnings": self.warnings}
|
||||
|
||||
def _list(self, step: dict[str, Any]) -> list[dict[str, Any]]:
|
||||
@@ -311,7 +318,11 @@ class Sync:
|
||||
if existing and not current and existing.get("uuid"):
|
||||
_, data = self.api.request("GET", f"/config-profiles/{existing['uuid']}")
|
||||
current = _as_obj(data).get("config")
|
||||
private, short = _reality(current, item["inbound_tag"])
|
||||
env_private = os.environ.get("RW_REALITY_PRIVATE_KEY", "").strip()
|
||||
env_short = os.environ.get("RW_REALITY_SHORT_ID", "").strip()
|
||||
cur_private, cur_short = _reality(current, item["inbound_tag"])
|
||||
private = env_private or cur_private
|
||||
short = env_short or cur_short
|
||||
if not private:
|
||||
_, data = self.api.request("GET", "/system/tools/x25519/generate")
|
||||
body = _as_obj(data)
|
||||
@@ -321,6 +332,10 @@ class Sync:
|
||||
raise RuntimeError(f"Не удалось сгенерировать X25519 для профиля {item['name']}")
|
||||
if not short:
|
||||
short = secrets.token_hex(8)
|
||||
if not self.reality_private_key:
|
||||
self.reality_private_key = private
|
||||
if not self.reality_short_id:
|
||||
self.reality_short_id = short
|
||||
raw = self.files[item["template"]]
|
||||
rendered = (
|
||||
raw.replace("__REALITY_PRIVATE_KEY__", private)
|
||||
@@ -337,7 +352,9 @@ class Sync:
|
||||
if current is None and existing.get("uuid"):
|
||||
_, data = self.api.request("GET", f"/config-profiles/{existing['uuid']}")
|
||||
current = _as_obj(data).get("config")
|
||||
if _reality(current, prepared["inbound_tag"])[0] == "":
|
||||
cur_priv, cur_short = _reality(current, prepared["inbound_tag"])
|
||||
want_priv, want_short = _reality(prepared.get("config"), prepared["inbound_tag"])
|
||||
if cur_priv == "" or (want_priv and cur_priv != want_priv) or (want_short and cur_short != want_short):
|
||||
return True
|
||||
return _canon_profile(current) != _canon_profile(prepared.get("config"))
|
||||
|
||||
@@ -522,6 +539,43 @@ class Sync:
|
||||
if not self.xray_url and user.get("shortUuid") and self.cfg.get("sub_domain"):
|
||||
self.xray_url = f"https://{self.cfg['sub_domain']}/{user['shortUuid']}"
|
||||
|
||||
def _collect_opnsense_links(self) -> None:
|
||||
wanted: dict[str, str] = {}
|
||||
for node in self.desired.get("nodes") or []:
|
||||
secret_name = str(node.get("opnsense_secret") or "").strip()
|
||||
if not secret_name:
|
||||
continue
|
||||
profile = self.refs.get("profile", {}).get(node.get("profile", "")) or {}
|
||||
domain = str(profile.get("selfsteal_domain") or "").strip().lower()
|
||||
if domain:
|
||||
wanted[domain] = secret_name
|
||||
if not wanted or not self.xray_url:
|
||||
return
|
||||
sub_domain = str(self.cfg.get("sub_domain") or "").strip()
|
||||
cmd = ["curl", "-sSk", "--max-time", "15", "-H", "User-Agent: v2rayNG/1.8"]
|
||||
if sub_domain:
|
||||
cmd.extend(["--resolve", f"{sub_domain}:443:127.0.0.1"])
|
||||
cmd.append(self.xray_url)
|
||||
proc = subprocess.run(cmd, capture_output=True, check=False)
|
||||
if proc.returncode != 0:
|
||||
return
|
||||
raw = proc.stdout.decode("utf-8", errors="replace").strip()
|
||||
if not raw:
|
||||
return
|
||||
if not raw.startswith("vless://"):
|
||||
try:
|
||||
pad = "=" * ((4 - len(raw) % 4) % 4)
|
||||
raw = base64.b64decode(raw + pad).decode("utf-8", errors="replace")
|
||||
except Exception:
|
||||
return
|
||||
for line in raw.splitlines():
|
||||
link = line.strip()
|
||||
if not link.startswith("vless://"):
|
||||
continue
|
||||
host = (urllib.parse.urlsplit(link).hostname or "").strip().lower()
|
||||
if host in wanted:
|
||||
self.opnsense_links[wanted[host]] = link
|
||||
|
||||
def _write_xray_url(self) -> None:
|
||||
path = os.environ.get("RW_XRAY_URL_FILE", "").strip()
|
||||
if not path:
|
||||
@@ -530,6 +584,19 @@ class Sync:
|
||||
handle.write(self.xray_url)
|
||||
os.chmod(path, 0o600)
|
||||
|
||||
def _write_sync_secrets(self) -> None:
|
||||
path = os.environ.get("RW_SYNC_SECRETS_FILE", "").strip()
|
||||
if not path:
|
||||
return
|
||||
payload = {
|
||||
"reality_private_key": self.reality_private_key,
|
||||
"reality_short_id": self.reality_short_id,
|
||||
"opnsense_links": self.opnsense_links,
|
||||
}
|
||||
with open(path, "w", encoding="utf-8") as handle:
|
||||
json.dump(payload, handle, ensure_ascii=False)
|
||||
os.chmod(path, 0o600)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if len(sys.argv) == 2 and sys.argv[1] == "--selftest":
|
||||
|
||||
@@ -2,15 +2,20 @@
|
||||
- name: Определить изменившиеся секреты для Infisical
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_current_xray_url: "{{ lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='') }}"
|
||||
remnawave_sync_reality_private_key: "{{ (remnawave_sync_secrets | default({})).reality_private_key | default('') }}"
|
||||
remnawave_sync_reality_short_id: "{{ (remnawave_sync_secrets | default({})).reality_short_id | default('') }}"
|
||||
remnawave_sync_opnsense_links: "{{ (remnawave_sync_secrets | default({})).opnsense_links | default({}) }}"
|
||||
remnawave_need_infisical_sync: >-
|
||||
{{
|
||||
(remnawave_bootstrap.token_updated | default(false)) or
|
||||
(remnawave_bootstrap.node_secret_created | default(false)) or
|
||||
((remnawave_xray_checker_url | default('') | length > 0) and (remnawave_xray_checker_url != lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default='')))
|
||||
((remnawave_xray_checker_url | default('') | length > 0) and (remnawave_xray_checker_url != lookup('env', 'XRAY_CHECKER_SUBSCRIPTION_URL', default=''))) or
|
||||
(((remnawave_sync_secrets | default({})).reality_private_key | default('') | length > 0) and ((remnawave_sync_secrets | default({})).reality_private_key != lookup('env', 'REMNAWAVE_REALITY_PRIVATE_KEY', default=''))) or
|
||||
(((remnawave_sync_secrets | default({})).reality_short_id | default('') | length > 0) and ((remnawave_sync_secrets | default({})).reality_short_id != lookup('env', 'REMNAWAVE_REALITY_SHORT_ID', default='')))
|
||||
}}
|
||||
no_log: true
|
||||
|
||||
- name: Сохранить API-токен, SECRET_KEY ноды и ссылку Xray Checker в Infisical при изменении
|
||||
- name: Сохранить API-токен, SECRET_KEY ноды, ключи Reality и ссылку Xray Checker в Infisical при изменении
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
args=(
|
||||
@@ -20,6 +25,12 @@
|
||||
if [ -n "${RW_XRAY_URL:-}" ]; then
|
||||
args+=("XRAY_CHECKER_SUBSCRIPTION_URL=${RW_XRAY_URL}")
|
||||
fi
|
||||
if [ -n "${RW_REALITY_PRIV:-}" ]; then
|
||||
args+=("REMNAWAVE_REALITY_PRIVATE_KEY=${RW_REALITY_PRIV}")
|
||||
fi
|
||||
if [ -n "${RW_REALITY_SID:-}" ]; then
|
||||
args+=("REMNAWAVE_REALITY_SHORT_ID=${RW_REALITY_SID}")
|
||||
fi
|
||||
infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
@@ -39,12 +50,44 @@
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_NODE_SECRET: "{{ remnawave_node_secret | default(lookup('env', 'REMNANODE_SECRET_KEY', default='')) }}"
|
||||
RW_XRAY_URL: "{{ remnawave_xray_checker_url | default('') }}"
|
||||
RW_REALITY_PRIV: "{{ remnawave_sync_reality_private_key }}"
|
||||
RW_REALITY_SID: "{{ remnawave_sync_reality_short_id }}"
|
||||
when:
|
||||
- remnawave_api_token | default('') | length > 0
|
||||
- remnawave_need_infisical_sync | bool
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
- name: Синхронизировать VLESS-ссылки нод в Infisical (/services/opnsense-xray) при изменении
|
||||
ansible.builtin.shell: |
|
||||
set -euo pipefail
|
||||
infisical secrets set \
|
||||
--domain="${INFISICAL_DOMAIN}" \
|
||||
--token="${INFISICAL_TOKEN}" \
|
||||
--env=prod \
|
||||
--projectId="${INFISICAL_PROJECT_ID}" \
|
||||
--path="/services/opnsense-xray" \
|
||||
"${SECRET_NAME}=${SECRET_VAL}" \
|
||||
--silent >/dev/null
|
||||
args:
|
||||
executable: /bin/bash
|
||||
delegate_to: localhost
|
||||
become: false
|
||||
environment:
|
||||
INFISICAL_DOMAIN: "{{ lookup('env', 'INFISICAL_DOMAIN') }}"
|
||||
INFISICAL_TOKEN: "{{ lookup('env', 'INFISICAL_TOKEN') }}"
|
||||
INFISICAL_PROJECT_ID: "{{ lookup('env', 'INFISICAL_PROJECT_ID') }}"
|
||||
SECRET_NAME: "{{ item.key }}"
|
||||
SECRET_VAL: "{{ item.value }}"
|
||||
loop: "{{ remnawave_sync_opnsense_links | dict2items }}"
|
||||
loop_control:
|
||||
label: "{{ item.key }}"
|
||||
when:
|
||||
- item.value | length > 0
|
||||
- item.value != lookup('env', item.key, default='')
|
||||
changed_when: true
|
||||
no_log: true
|
||||
|
||||
- name: Зарегистрировать панель Remnawave в Agent Vault
|
||||
ansible.builtin.include_role:
|
||||
name: agent_vault_service
|
||||
|
||||
@@ -41,7 +41,10 @@
|
||||
ansible.builtin.command: "python3 {{ remnawave_dir }}/sync_remnawave.py {{ remnawave_dir }}/sync_config.json"
|
||||
environment:
|
||||
RW_API_TOKEN: "{{ remnawave_api_token }}"
|
||||
RW_REALITY_PRIVATE_KEY: "{{ lookup('env', 'REMNAWAVE_REALITY_PRIVATE_KEY', default='') }}"
|
||||
RW_REALITY_SHORT_ID: "{{ lookup('env', 'REMNAWAVE_REALITY_SHORT_ID', default='') }}"
|
||||
RW_XRAY_URL_FILE: "{{ remnawave_dir }}/.xray-checker-url"
|
||||
RW_SYNC_SECRETS_FILE: "{{ remnawave_dir }}/.sync-secrets.json"
|
||||
register: remnawave_sync_raw
|
||||
changed_when: remnawave_sync_raw.rc == 0 and ((remnawave_sync_raw.stdout | from_json).changed | default(false))
|
||||
|
||||
@@ -52,8 +55,16 @@
|
||||
failed_when: false
|
||||
no_log: true
|
||||
|
||||
- name: Прочитать выходные секреты синхронизации Remnawave
|
||||
ansible.builtin.slurp:
|
||||
src: "{{ remnawave_dir }}/.sync-secrets.json"
|
||||
register: remnawave_sync_secrets_file
|
||||
failed_when: false
|
||||
no_log: true
|
||||
|
||||
- name: Разобрать результат синхронизации Remnawave
|
||||
ansible.builtin.set_fact:
|
||||
remnawave_sync: "{{ remnawave_sync_raw.stdout | from_json }}"
|
||||
remnawave_xray_checker_url: "{{ remnawave_xray_url_file.content | default('') | b64decode }}"
|
||||
remnawave_sync_secrets: "{{ (remnawave_sync_secrets_file.content | default('') | b64decode | from_json) if (remnawave_sync_secrets_file.content is defined and (remnawave_sync_secrets_file.content | length > 0)) else {} }}"
|
||||
no_log: true
|
||||
Reference in new issue
Block a user