wenil/amneziavpnphp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: proper json escaping in xray install script

Browse Source
This commit is contained in:
infosave2007
2026-01-23 19:33:58 +03:00
parent 0a274ec263
commit aa956e0ab2
1 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrations/043_fix_xray_json_quotes.sql
+83
View File
@@ -0,0 +1,83 @@
-- Fix X-Ray install script JSON quotes
-- Previous migration caused missing quotes in JSON because MySQL consumed one level of escaping
-- We need \\\" in SQL to get \" in Bash, which echo outputs as " in the file
UPDATE protocols
SET install_script = '#!/bin/bash
set -euo pipefail
CONTAINER_NAME="${CONTAINER_NAME:-amnezia-xray}"
PORT_RANGE_START=${PORT_RANGE_START:-30000}
PORT_RANGE_END=${PORT_RANGE_END:-65000}
XRAY_PORT=${SERVER_PORT:-$((RANDOM % (PORT_RANGE_END - PORT_RANGE_START + 1) + PORT_RANGE_START))}
# Ensure image present
docker pull teddysun/xray >/dev/null 2>&1 || true
# Generate keys
GEN=$(docker run --rm --entrypoint /usr/bin/xray teddysun/xray x25519 2>/dev/null || true)
PRIVATE_KEY=$(printf "%s\\n" "$GEN" | sed -n -E "s/^[Pp]rivate[[:space:]]*[Kk]ey:[[:space:]]*(.*)$/\\1/p" | tr -d " \\t\\r\\n")
PUBLIC_KEY=$(printf "%s\\n" "$GEN" | sed -n -E "s/^[Pp]ublic[[:space:]]*[Kk]ey:[[:space:]]*(.*)$/\\1/p" | tr -d " \\t\\r\\n")
if [ -z "$PUBLIC_KEY" ] && [ -n "$PRIVATE_KEY" ]; then
PUBLIC_KEY=$(docker run --rm --entrypoint /usr/bin/xray teddysun/xray x25519 -i "$PRIVATE_KEY" 2>/dev/null | sed -n -E "s/^[Pp]ublic[[:space:]]*[Kk]ey:[[:space:]]*(.*)$/\\1/p" | tr -d " \\t\\r\\n" || true)
fi
SHORT_ID=$(od -An -tx1 -N8 /dev/urandom | tr -d " \\n")
CLIENT_ID=$(cat /proc/sys/kernel/random/uuid)
SERVER_NAME="${SERVER_NAME:-www.googletagmanager.com}"
FINGERPRINT="${FINGERPRINT:-chrome}"
SPIDER_X="${SPIDER_X:-/}"
docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
mkdir -p /opt/amnezia/xray
C="/opt/amnezia/xray/server.json"
echo "{" > "$C"
echo " \\\"log\\\": { \\\"loglevel\\\": \\\"warning\\\" }," >> "$C"
echo " \\\"inbounds\\\": [" >> "$C"
echo " {" >> "$C"
echo " \\\"listen\\\": \\\"0.0.0.0\\\"," >> "$C"
echo " \\\"port\\\": $XRAY_PORT," >> "$C"
echo " \\\"protocol\\\": \\\"vless\\\"," >> "$C"
echo " \\\"settings\\\": {" >> "$C"
echo " \\\"clients\\\": [ { \\\"id\\\": \\\"$CLIENT_ID\\\" } ]," >> "$C"
echo " \\\"decryption\\\": \\\"none\\\"" >> "$C"
echo " }," >> "$C"
echo " \\\"streamSettings\\\": {" >> "$C"
echo " \\\"network\\\": \\\"tcp\\\"," >> "$C"
echo " \\\"security\\\": \\\"reality\\\"," >> "$C"
echo " \\\"realitySettings\\\": {" >> "$C"
echo " \\\"show\\\": false," >> "$C"
echo " \\\"dest\\\": \\\"$SERVER_NAME:443\\\"," >> "$C"
echo " \\\"xver\\\": 0," >> "$C"
echo " \\\"serverNames\\\": [ \\\"$SERVER_NAME\\\" ]," >> "$C"
echo " \\\"privateKey\\\": \\\"$PRIVATE_KEY\\\"," >> "$C"
echo " \\\"shortIds\\\": [ \\\"$SHORT_ID\\\" ]," >> "$C"
echo " \\\"fingerprint\\\": \\\"$FINGERPRINT\\\"," >> "$C"
echo " \\\"spiderX\\\": \\\"$SPIDER_X\\\"" >> "$C"
echo " }" >> "$C"
echo " }" >> "$C"
echo " }" >> "$C"
echo " ]," >> "$C"
echo " \\\"outbounds\\\": [ { \\\"protocol\\\": \\\"freedom\\\", \\\"tag\\\": \\\"direct\\\" } ]" >> "$C"
echo "}" >> "$C"
docker run -d \
--name "$CONTAINER_NAME" \
--restart always \
-p "${XRAY_PORT}:${XRAY_PORT}" \
-v /opt/amnezia/xray:/opt/amnezia/xray \
teddysun/xray xray run -c /opt/amnezia/xray/server.json
sleep 2
echo "XrayPort: ${XRAY_PORT}"
echo "Port: ${XRAY_PORT}"
echo "ClientID: ${CLIENT_ID}"
echo "PublicKey: ${PUBLIC_KEY}"
echo "PrivateKey: ${PRIVATE_KEY}"
echo "ShortID: ${SHORT_ID}"
echo "ServerName: ${SERVER_NAME}"
echo "ContainerName: ${CONTAINER_NAME}"'
WHERE slug = 'xray-vless';