From a4a06558883ef73f234bda22e3608aeedae93a53 Mon Sep 17 00:00:00 2001 From: karpenok Date: Wed, 11 Nov 2026 22:48:29 +0700 Subject: [PATCH] =?UTF-8?q?fix(remnawave):=20=D0=BF=D0=B0=D1=80=D1=81?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20keypairs[]=20=D0=B8=D0=B7=20x25519=20gener?= =?UTF-8?q?ate=20v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit API отдаёт массив пар, а не одиночные privateKey/publicKey. Co-authored-by: Cursor --- .../core-net/remnawave/templates/bootstrap-panel.sh.j2 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 b/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 index 65765f5..8f33e05 100644 --- a/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 +++ b/ansible/roles/core-net/remnawave/templates/bootstrap-panel.sh.j2 @@ -117,11 +117,14 @@ pub="" if [ -z "${profile_uuid}" ]; then key_resp=$(api GET /system/tools/x25519/generate 2>/dev/null || echo '{}') + # v3: {response:{keypairs:[{publicKey,privateKey},...]}} priv=$(printf '%s' "${key_resp}" | jq -r ' - .response.privateKey // .response.privKey // .privateKey // .privKey // empty') + .response.keypairs[0].privateKey + // .response.privateKey // .response.privKey // .privateKey // .privKey // empty') pub=$(printf '%s' "${key_resp}" | jq -r ' - .response.publicKey // .response.pubKey // .publicKey // .pubKey // empty') - if [ -z "${priv}" ]; then + .response.keypairs[0].publicKey + // .response.publicKey // .response.pubKey // .publicKey // .pubKey // empty') + if [ -z "${priv}" ] || [ -z "${pub}" ]; then echo "Не удалось сгенерировать X25519 ключи Reality" >&2 printf '%s\n' "${key_resp}" >&2 exit 1