Implement the extended CONNECT protocol from RFC 8441 (#565)
This commit is contained in:
@@ -1149,3 +1149,191 @@ async fn send_reset_explicitly() {
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn extended_connect_protocol_disabled_by_default() {
|
||||
h2_support::trace_init!();
|
||||
|
||||
let (io, mut client) = mock::new();
|
||||
|
||||
let client = async move {
|
||||
let settings = client.assert_server_handshake().await;
|
||||
|
||||
assert_eq!(settings.is_extended_connect_protocol_enabled(), None);
|
||||
|
||||
client
|
||||
.send_frame(
|
||||
frames::headers(1)
|
||||
.request("CONNECT", "http://bread/baguette")
|
||||
.protocol("the-bread-protocol"),
|
||||
)
|
||||
.await;
|
||||
|
||||
client.recv_frame(frames::reset(1).protocol_error()).await;
|
||||
};
|
||||
|
||||
let srv = async move {
|
||||
let mut srv = server::handshake(io).await.expect("handshake");
|
||||
|
||||
poll_fn(move |cx| srv.poll_closed(cx))
|
||||
.await
|
||||
.expect("server");
|
||||
};
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn extended_connect_protocol_enabled_during_handshake() {
|
||||
h2_support::trace_init!();
|
||||
|
||||
let (io, mut client) = mock::new();
|
||||
|
||||
let client = async move {
|
||||
let settings = client.assert_server_handshake().await;
|
||||
|
||||
assert_eq!(settings.is_extended_connect_protocol_enabled(), Some(true));
|
||||
|
||||
client
|
||||
.send_frame(
|
||||
frames::headers(1)
|
||||
.request("CONNECT", "http://bread/baguette")
|
||||
.protocol("the-bread-protocol"),
|
||||
)
|
||||
.await;
|
||||
|
||||
client.recv_frame(frames::headers(1).response(200)).await;
|
||||
};
|
||||
|
||||
let srv = async move {
|
||||
let mut builder = server::Builder::new();
|
||||
|
||||
builder.enable_connect_protocol();
|
||||
|
||||
let mut srv = builder.handshake::<_, Bytes>(io).await.expect("handshake");
|
||||
|
||||
let (_req, mut stream) = srv.next().await.unwrap().unwrap();
|
||||
|
||||
let rsp = Response::new(());
|
||||
stream.send_response(rsp, false).unwrap();
|
||||
|
||||
poll_fn(move |cx| srv.poll_closed(cx))
|
||||
.await
|
||||
.expect("server");
|
||||
};
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reject_pseudo_protocol_on_non_connect_request() {
|
||||
h2_support::trace_init!();
|
||||
|
||||
let (io, mut client) = mock::new();
|
||||
|
||||
let client = async move {
|
||||
let settings = client.assert_server_handshake().await;
|
||||
|
||||
assert_eq!(settings.is_extended_connect_protocol_enabled(), Some(true));
|
||||
|
||||
client
|
||||
.send_frame(
|
||||
frames::headers(1)
|
||||
.request("GET", "http://bread/baguette")
|
||||
.protocol("the-bread-protocol"),
|
||||
)
|
||||
.await;
|
||||
|
||||
client.recv_frame(frames::reset(1).protocol_error()).await;
|
||||
};
|
||||
|
||||
let srv = async move {
|
||||
let mut builder = server::Builder::new();
|
||||
|
||||
builder.enable_connect_protocol();
|
||||
|
||||
let mut srv = builder.handshake::<_, Bytes>(io).await.expect("handshake");
|
||||
|
||||
assert!(srv.next().await.is_none());
|
||||
|
||||
poll_fn(move |cx| srv.poll_closed(cx))
|
||||
.await
|
||||
.expect("server");
|
||||
};
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reject_authority_target_on_extended_connect_request() {
|
||||
h2_support::trace_init!();
|
||||
|
||||
let (io, mut client) = mock::new();
|
||||
|
||||
let client = async move {
|
||||
let settings = client.assert_server_handshake().await;
|
||||
|
||||
assert_eq!(settings.is_extended_connect_protocol_enabled(), Some(true));
|
||||
|
||||
client
|
||||
.send_frame(
|
||||
frames::headers(1)
|
||||
.request("CONNECT", "bread:80")
|
||||
.protocol("the-bread-protocol"),
|
||||
)
|
||||
.await;
|
||||
|
||||
client.recv_frame(frames::reset(1).protocol_error()).await;
|
||||
};
|
||||
|
||||
let srv = async move {
|
||||
let mut builder = server::Builder::new();
|
||||
|
||||
builder.enable_connect_protocol();
|
||||
|
||||
let mut srv = builder.handshake::<_, Bytes>(io).await.expect("handshake");
|
||||
|
||||
assert!(srv.next().await.is_none());
|
||||
|
||||
poll_fn(move |cx| srv.poll_closed(cx))
|
||||
.await
|
||||
.expect("server");
|
||||
};
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reject_non_authority_target_on_connect_request() {
|
||||
h2_support::trace_init!();
|
||||
|
||||
let (io, mut client) = mock::new();
|
||||
|
||||
let client = async move {
|
||||
let settings = client.assert_server_handshake().await;
|
||||
|
||||
assert_eq!(settings.is_extended_connect_protocol_enabled(), Some(true));
|
||||
|
||||
client
|
||||
.send_frame(frames::headers(1).request("CONNECT", "https://bread/baguette"))
|
||||
.await;
|
||||
|
||||
client.recv_frame(frames::reset(1).protocol_error()).await;
|
||||
};
|
||||
|
||||
let srv = async move {
|
||||
let mut builder = server::Builder::new();
|
||||
|
||||
builder.enable_connect_protocol();
|
||||
|
||||
let mut srv = builder.handshake::<_, Bytes>(io).await.expect("handshake");
|
||||
|
||||
assert!(srv.next().await.is_none());
|
||||
|
||||
poll_fn(move |cx| srv.poll_closed(cx))
|
||||
.await
|
||||
.expect("server");
|
||||
};
|
||||
|
||||
join(client, srv).await;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user