Files
luci-app-owrt-remote/FORK.md
T
cyril d482ed97c4 fork: REALITY client must carry shortId; default camo moved off www.microsoft.com
Verified 22.11.2026 (xray 26.7.28 + 26.11.9, matrix of 4 version pairs):
- REALITY authenticates fine both directions ONLY when the client
  realitySettings includes "shortId"; without it the server silently
  falls back to passthrough ("received real certificate").
- dest www.microsoft.com is broken for REALITY MITM (Microsoft now
  serves post-quantum cert chains); www.cloudflare.com / www.apple.com /
  www.google.com / download.windowsupdate.com / www.jetbrains.com all work.
- hub transport: expose shortId in summary/payload/uci line; agent reads
  uci reality_short_id and emits "shortId" in realitySettings.

NOTE: new tag-form VLESS reverse (Rvs, PR #5101) does NOT register its
control connection when the bridge transport is REALITY on xray >= 26.7
(portal logs show handshake auth OK but no v1.rvs.cool request;
security=none works). See XTLS/Xray-core #6242 #6248. Reverse-over-REALITY
e2e therefore blocked pending core-version bisect (26.4.25) or upstream fix.
2026-11-22 12:15:22 +03:00

30 lines
2.6 KiB
Markdown
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
# FORK.md — изменения форка (cyril/luci-app-owrt-remote)
Форк `kzolotarev95/luci-app-owrt-remote`. Зеркало upstream: `~/mirrors/luci-app-owrt-remote.git` (GitHub origin), push-копия в Gitea `11.11.11.106:3000/cyril/luci-app-owrt-remote` (pull-зеркало отключено; ресинк вручную, наши коммиты — поверх upstream main).
## Наш коммит: REALITY для hops роутер↔хаб
`VLESS+Reality` вместо `security=none` (см. `docs/REALITY_TRANSPORT.md`):
- `vps/owrt-remote-hub.py`
- профиль транспорта `STATE_DIR/transport.json` (x25519-пара через бинарь xray, shortId, dest/SNI, fingerprint); env `OWRT_REMOTE_TRANSPORT` (`reality` по умолчанию, `none` — как upstream), `OWRT_REMOTE_REALITY_DEST`, `OWRT_REMOTE_REALITY_FINGERPRINT`, `OWRT_REMOTE_XRAY_BINARY`;
- reality streamSettings в `make_server_xray_config()` и `make_router_xray_config()`;
- uci-строки `security`, `reality_public_key`, `reality_server_name`, `reality_fingerprint` в генерируемом конфиге роутера;
- блок `transport` в heartbeat `hub_update`;
- `reload_vps_xray` пишет конфиг в candidate-файл, гоняет `xray -test` и только потом подменяет — кривой конфиг не убьёт живой туннель.
- `files/usr/sbin/owrt-remote` — те же поля uci + валидация + reality streamSettings в `render_client_config`, compat-probe по security, возрастная проверка ядра для reality (< 24.2.14 — заменить).
- `files/etc/config/owrtremote`, поля формы в `files/www/cgi-bin/owrt-remote`, `PKG_RELEASE:=3`.
## Известные проблемы upstream, на которые наткнулись
- **XTLS/Xray-core#7259**: REALITY-серверы >= 26.9.8 отвергают client hello («received real certificate (potential MITM or redirection)»), работает на 26.7.28. Хабы держим на **xray-core 26.7.28**, пока upstream не починит. Проверка матрицы версий — в `docs/REALITY_TRANSPORT.md`.
## Как ресинкать с upstream
```
git -C ~/mirrors/luci-app-owrt-remote.git fetch origin
git -C ~/mirrors/luci-app-owrt-remote.git merge --ff-only origin/main # или rebase нашей ветки
# конфликты вероятны в owrt-remote-hub.py (make_server/client configs) — сверять с docs/REALITY_TRANSPORT.md
git -C ~/forks/luci-app-owrt-remote fetch && git -C ~/forks/luci-app-owrt-remote rebase main
```