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
@@ -21,6 +21,8 @@ config remote 'main'
|
||||
option reality_public_key ''
|
||||
option reality_server_name ''
|
||||
option reality_fingerprint 'chrome'
|
||||
option tls_sni ''
|
||||
option tls_pin ''
|
||||
option reverse_tag 'reverse-in'
|
||||
option ssh_vless_uuid ''
|
||||
option ssh_reverse_tag 'reverse-in-ssh'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -192,7 +192,7 @@ save_config() {
|
||||
fi
|
||||
uci_set enabled "$enabled"
|
||||
|
||||
for field in router_id router_name role hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow security reality_public_key reality_server_name reality_fingerprint reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port public_url; do
|
||||
for field in router_id router_name role hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_port vless_uuid vless_encryption vless_flow security reality_public_key reality_short_id reality_server_name reality_fingerprint tls_sni tls_pin reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port public_url; do
|
||||
uci_set "$field" "$(param "$field")"
|
||||
done
|
||||
if has_param vps_host_auto; then uci_set vps_host_mode auto; else uci_set vps_host_mode manual; fi
|
||||
@@ -208,7 +208,7 @@ save_config() {
|
||||
|
||||
clear_config() {
|
||||
local field
|
||||
for field in role public_url hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_host_mode wan_direct wan_interface wan_dns vps_port vless_uuid vless_encryption vless_flow security reality_public_key reality_server_name reality_fingerprint reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port; do
|
||||
for field in role public_url hub_url hub_token heartbeat_interval xray_bin xray_config vps_host vps_host_mode wan_direct wan_interface wan_dns vps_port vless_uuid vless_encryption vless_flow security reality_public_key reality_short_id reality_server_name reality_fingerprint tls_sni tls_pin reverse_tag ssh_vless_uuid ssh_reverse_tag admin_host admin_port ssh_host ssh_port; do
|
||||
uci -q delete "owrtremote.main.$field"
|
||||
done
|
||||
uci commit owrtremote
|
||||
@@ -715,7 +715,10 @@ EOF
|
||||
field vless_uuid "VLESS UUID" text "Уникальный UUID роутера. Бери из карточки роутера на VPS или из команды print-openwrt-config."
|
||||
field vless_encryption "VLESS encryption" text "Для этой схемы оставь none. Меняй только если сам меняешь Xray-конфиг на VPS."
|
||||
field vless_flow "VLESS flow" text "Обычно оставь пустым. Нужно только для специальных режимов Xray."
|
||||
field security "Транспорт (security)" text "none или reality. reality — TLS-упаковка VLESS (рекомендуется). Остальные значения — из карточки роутера на VPS."
|
||||
field security "Транспорт (security)" text "tls (рекомендуется), reality или none. Остальные значения — из карточки роутера на VPS."
|
||||
field reality_short_id "Reality shortId" text "8 hex-символов. Только для security=reality."
|
||||
field tls_sni "TLS SNI" text "SNI/CN сертификата хаба. Только для security=tls."
|
||||
field tls_pin "TLS pin" text "64 hex-символа SHA256 сертификата хаба. Только для security=tls."
|
||||
field reality_public_key "Reality public key" text "43-символьный публичный ключ X25519 хаба. Только для security=reality."
|
||||
field reality_server_name "Reality SNI" text "Camouflage-домен хаба, например www.microsoft.com. Только для security=reality."
|
||||
field reality_fingerprint "Reality fingerprint" text "Отпечаток клиента: chrome, firefox, safari, ios или android."
|
||||
|
||||
Reference in new issue
Block a user