fork: security=tls (self-signed + pinnedPeerCertSha256) becomes the default hop transport
reverse-over-REALITY is broken on xray >= 26.7 (Rvs control channel never registers; XTLS/Xray-core #6242/#6248 family). Verified loopback e2e with hub-generated configs on 26.11.9<->26.11.9 and 26.11.9<->26.7.28: portal entry-* -> reverse mux -> router-admin redirect = HTTP 200 over pinned TLS. - hub: OWRT_REMOTE_TRANSPORT=tls|reality|none (default tls); generates self-signed cert (openssl) + exposes pin; serves tls streamSettings. - agent: uci tls_sni/tls_pin, validation, tls branch in render_client_config. - CGI: reality_short_id/tls_sni/tls_pin fields; uci config lines extended. - docs: REALITY_TRANSPORT.md extended with the bisect results and pitfalls (freedom finalRules for reverse egress, bridge registers ~2s late, legacy reverse objects removed).
This commit is contained in:
1 parent
d482ed97c4
commit
05972f8c24
6 files changed
+151
-11
No files matched your search
@@ -705,6 +705,8 @@ render_client_config() (
|
||||
reality_sid="$(uci_get reality_short_id '')"
|
||||
reality_sni="$(uci_get reality_server_name '')"
|
||||
reality_fp="$(uci_get reality_fingerprint chrome)"
|
||||
tls_sni="$(uci_get tls_sni '')"
|
||||
tls_pin="$(uci_get tls_pin '')"
|
||||
reverse_tag="$(uci_get reverse_tag reverse-in)"
|
||||
ssh_reverse_tag="$(uci_get ssh_reverse_tag "${reverse_tag}-ssh")"
|
||||
admin_host="$(uci_get admin_host 127.0.0.1)"
|
||||
@@ -729,8 +731,17 @@ render_client_config() (
|
||||
fi
|
||||
done
|
||||
case "$vps_host" in *://*|*/*) die "vps_host должен содержать IP или домен без http(s):// и пути" ;; esac
|
||||
case "$security" in none|reality) ;; *) die "security: ожидается none или reality" ;; esac
|
||||
if [ "$security" = reality ]; then
|
||||
case "$security" in none|reality|tls) ;; *) die "security: ожидается none, reality или tls" ;; esac
|
||||
if [ "$security" = tls ]; then
|
||||
case "$tls_sni" in ''|*://*) die "tls_sni: SNI-домен хаба без схемы и путей" ;; esac
|
||||
if [ "$(printf '%s' "$tls_sni" | LC_ALL=C tr -d '\001-\040\177')" != "$tls_sni" ]; then
|
||||
die "tls_sni: содержит пробел или управляющий символ"
|
||||
fi
|
||||
case "$tls_pin" in *[!0-9a-fA-F]*|'') die "tls_pin: 64-символьный hex SHA256 сертификата хаба из карточки роутера на VPS" ;; esac
|
||||
[ "${#tls_pin}" -eq 64 ] || die "tls_pin: длина SHA256 должна быть 64 hex-символа"
|
||||
transport_stream='"security": "tls",
|
||||
"tlsSettings": {"serverName": "'"$(json_escape "$tls_sni")"'", "pinnedPeerCertSha256": "'"$(json_escape "$tls_pin")"'", "alpn": ["h2", "http/1.1"], "fingerprint": "'"$(json_escape "$reality_fp")"'"}'
|
||||
elif [ "$security" = reality ]; then
|
||||
case "$reality_pk" in ''|*[!A-Za-z0-9_-]*) die "reality_public_key: ожидается 43-символьный base64url-ключ X25519 из карточки роутера на VPS" ;; esac
|
||||
[ "${#reality_pk}" -eq 43 ] || die "reality_public_key: длина ключа X25519 должна быть 43 символа"
|
||||
case "$reality_sni" in ''|*://*) die "reality_server_name: укажите camouflage-домен без схемы и путей (например www.microsoft.com)" ;; esac
|
||||
|
||||
Reference in new issue
Block a user