WEB: Base Path added

This commit is contained in:
Alexey
2026-09-26 13:49:28 +03:00
parent 326c0ecdb9
commit 5feded2919
32 changed files with 1094 additions and 125 deletions
+45 -2
View File
@@ -14,7 +14,9 @@ use tokio_util::sync::CancellationToken;
use crate::maestro::generation::{RuntimeGeneration, test_runtime_generation};
use crate::web::frame::{self, FrameType};
use crate::web::http::tests::{negotiation_runtime_config, runtime_config};
use crate::web::http::tests::{
negotiation_runtime_config, runtime_config, runtime_config_with_base,
};
use crate::web::manager::{
CarrierCapabilities, CarrierClientClass, CarrierFailure, CarrierRequest, WebProcessRuntime,
};
@@ -210,6 +212,15 @@ async fn upgrade(
listener: &TcpListener,
runtime: &Arc<WebProcessRuntime>,
protocol: &str,
) -> WebSocketStream<TcpStream> {
upgrade_at(listener, runtime, "/api/v1/ws", protocol).await
}
async fn upgrade_at(
listener: &TcpListener,
runtime: &Arc<WebProcessRuntime>,
path: &str,
protocol: &str,
) -> WebSocketStream<TcpStream> {
let addr = listener.local_addr().unwrap();
let (accepted, client) = tokio::join!(listener.accept(), TcpStream::connect(addr));
@@ -226,7 +237,7 @@ async fn upgrade(
permit,
));
let request = format!(
"GET /api/v1/ws HTTP/1.1\r\nHost: proxy.example.com\r\nX-Forwarded-For: 192.0.2.10\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nSec-WebSocket-Protocol: {protocol}\r\nCookie: browser-state=allowed\r\n\r\n"
"GET {path} HTTP/1.1\r\nHost: proxy.example.com\r\nX-Forwarded-For: 192.0.2.10\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nSec-WebSocket-Protocol: {protocol}\r\nCookie: browser-state=allowed\r\n\r\n"
);
client.write_all(request.as_bytes()).await.unwrap();
let mut response = Vec::new();
@@ -244,6 +255,38 @@ async fn upgrade(
WebSocketStream::from_raw_socket(client, Role::Client, None).await
}
#[tokio::test]
async fn prefixed_websocket_route_upgrades_at_the_exact_base() {
let live = live_runtime_from_config(
runtime_config_with_base([31; 32], WebCarrier::Websocket, "/relay/nested/"),
1,
);
let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
let (session, _) = create_session(&live.runtime);
let protocol = format!("tproxy-v1.{session}");
let mut socket = upgrade_at(
&listener,
&live.runtime,
"/relay/nested/api/v1/ws",
&protocol,
)
.await;
socket
.send(Message::Ping(Bytes::from_static(b"prefixed")))
.await
.unwrap();
let response = tokio::time::timeout(Duration::from_secs(2), socket.next())
.await
.unwrap()
.unwrap()
.unwrap();
assert_eq!(response, Message::Pong(Bytes::from_static(b"prefixed")));
let _ = socket.close(None).await;
live.shutdown().await;
}
fn masked_message(opcode: u8, payload: &[u8], mask: [u8; 4]) -> Vec<u8> {
masked_frame(true, opcode, payload, mask)
}