mirror of
https://github.com/rustdesk/hbb_common.git
synced 2026-10-18 14:44:00 +00:00
21pages
3aade011c0
Support WS and WSS over SOCKS5, HTTP, and HTTPS proxies, including custom ports. Use the configured proxy only when allow-websocket-proxy is enabled; explicit proxy configuration takes precedence. Propagate proxy failures without retrying a direct connection. Add regression coverage for proxy routing, authentication, TLS, custom ports, direct defaults, and failure handling. Signed-off-by: 21pages <sunboeasy@gmail.com> fix: flush WebSocket proxy tunnels before native TLS reads Flush buffered HTTP and HTTPS tunnel writes before NativeTls reads so WSS handshakes can complete on macOS. Apply the adapter only to NativeTls WebSocket connections through HTTP or HTTPS proxies. Extend the existing proxy round-trip test with HTTPS and SOCKS5 NativeTls cases. The websocket_proxy integration test passes in the rustdesk workspace. Signed-off-by: 21pages <sunboeasy@gmail.com> refactor: simplify WebSocket proxy configuration Select the configured proxy inside WsFramedStream::new based on the WebSocket proxy option and remove the explicit proxy argument. Update the socket client and drop the unused Stream::connect_websocket wrapper. Adapt integration tests to configured proxies and cover custom target ports and WebSocket close handling.
13 lines
696 B
Plaintext
13 lines
696 B
Plaintext
-----BEGIN CERTIFICATE-----
|
|
MIIB1TCCAXugAwIBAgIUU5BrjQyAn16xm5+tfdJlWneyQA8wCgYIKoZIzj0EAwIw
|
|
IzEhMB8GA1UEAwwYd2Vic29ja2V0LXRhcmdldC5pbnZhbGlkMCAXDTI2MDkwODEx
|
|
NTg0NloYDzIxMjYwODE1MTE1ODQ2WjAjMSEwHwYDVQQDDBh3ZWJzb2NrZXQtdGFy
|
|
Z2V0LmludmFsaWQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATGz2rNvO/J5IZc
|
|
R2tAP18dE/cDqaqhSI/GrG9wsRKRDypx6C1AlhHp67+xsBxfxGX8qP+2IYqxPeEf
|
|
OaXTNmRuo4GKMIGHMB0GA1UdDgQWBBSQaINp0ts4Dxa2+7VJqavc7dykejAfBgNV
|
|
HSMEGDAWgBSQaINp0ts4Dxa2+7VJqavc7dykejAPBgNVHRMBAf8EBTADAQH/MDQG
|
|
A1UdEQQtMCuCGHdlYnNvY2tldC10YXJnZXQuaW52YWxpZIIJbG9jYWxob3N0hwR/
|
|
AAABMAoGCCqGSM49BAMCA0gAMEUCIQCfNhZYsn3MB0781bnGmxY5y+qvq1bl1xgx
|
|
6hB2jeCiwQIgeJjyi0sD3kg9IwExk1tvY1CqME8S3vX6B3A6OihqYUg=
|
|
-----END CERTIFICATE-----
|