tests: share raw HTTP request/response helpers
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YShymaPrXmc3KYRUg2HMSs
This commit is contained in:
1 parent
59956bb8b7
commit
66eb91bf01
3 files changed
+49
-45
No files matched your search
@@ -0,0 +1,37 @@
|
|||||||
|
//! Raw HTTP/1.1 helpers shared by the integration and TLS test binaries.
|
||||||
|
|
||||||
|
/// One request with `Connection: close`. `host` is used unless `headers`
|
||||||
|
/// already carries a `Host`.
|
||||||
|
pub fn request(
|
||||||
|
method: &str,
|
||||||
|
path: &str,
|
||||||
|
host: &str,
|
||||||
|
headers: &[(&str, &str)],
|
||||||
|
body: Option<&str>,
|
||||||
|
) -> String {
|
||||||
|
let mut req = format!("{method} {path} HTTP/1.1\r\nConnection: close\r\n");
|
||||||
|
if !headers.iter().any(|(k, _)| k.eq_ignore_ascii_case("host")) {
|
||||||
|
req.push_str(&format!("Host: {host}\r\n"));
|
||||||
|
}
|
||||||
|
for (k, v) in headers {
|
||||||
|
req.push_str(&format!("{k}: {v}\r\n"));
|
||||||
|
}
|
||||||
|
if let Some(b) = body {
|
||||||
|
req.push_str(&format!("Content-Length: {}\r\n\r\n{b}", b.len()));
|
||||||
|
} else {
|
||||||
|
req.push_str("\r\n");
|
||||||
|
}
|
||||||
|
req
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Split a raw response into (status, lowercase head, body).
|
||||||
|
pub fn parse_response(buf: &[u8]) -> (u16, String, String) {
|
||||||
|
let text = String::from_utf8_lossy(buf);
|
||||||
|
let (head, body) = text.split_once("\r\n\r\n").unwrap_or((&text, ""));
|
||||||
|
let status = head
|
||||||
|
.split_whitespace()
|
||||||
|
.nth(1)
|
||||||
|
.and_then(|s| s.parse().ok())
|
||||||
|
.unwrap_or(0);
|
||||||
|
(status, head.to_lowercase(), body.to_owned())
|
||||||
|
}
|
||||||
+5
-23
@@ -1,8 +1,10 @@
|
|||||||
//! Integration tests (P3 I2): the real assembled router on an ephemeral port
|
//! Integration tests: the real assembled router on an ephemeral port
|
||||||
//! with fake sources, plus the real binary for startup and SIGTERM checks.
|
//! with fake sources, plus the real binary for startup and SIGTERM checks.
|
||||||
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
|
mod common;
|
||||||
|
|
||||||
use skyg_linux_tracker::auth::tokens;
|
use skyg_linux_tracker::auth::tokens;
|
||||||
use skyg_linux_tracker::config::Config;
|
use skyg_linux_tracker::config::Config;
|
||||||
use skyg_linux_tracker::server;
|
use skyg_linux_tracker::server;
|
||||||
@@ -62,20 +64,7 @@ async fn http(
|
|||||||
wait: Duration,
|
wait: Duration,
|
||||||
) -> (u16, String, String) {
|
) -> (u16, String, String) {
|
||||||
let mut s = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
|
let mut s = TcpStream::connect(("127.0.0.1", port)).await.unwrap();
|
||||||
let mut req = format!("{method} {path} HTTP/1.1\r\nConnection: close\r\n");
|
let req = common::request(method, path, &format!("127.0.0.1:{port}"), headers, body);
|
||||||
if !headers.iter().any(|(k, _)| k.eq_ignore_ascii_case("host")) {
|
|
||||||
req.push_str(&format!("Host: 127.0.0.1:{port}\r\n"));
|
|
||||||
}
|
|
||||||
for (k, v) in headers {
|
|
||||||
req.push_str(&format!("{k}: {v}\r\n"));
|
|
||||||
}
|
|
||||||
if let Some(b) = body {
|
|
||||||
req.push_str(&format!("Content-Length: {}\r\n", b.len()));
|
|
||||||
}
|
|
||||||
req.push_str("\r\n");
|
|
||||||
if let Some(b) = body {
|
|
||||||
req.push_str(b);
|
|
||||||
}
|
|
||||||
s.write_all(req.as_bytes()).await.unwrap();
|
s.write_all(req.as_bytes()).await.unwrap();
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
let _ = tokio::time::timeout(wait, async {
|
let _ = tokio::time::timeout(wait, async {
|
||||||
@@ -88,14 +77,7 @@ async fn http(
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
let text = String::from_utf8_lossy(&buf).into_owned();
|
common::parse_response(&buf)
|
||||||
let (head, body) = text.split_once("\r\n\r\n").unwrap_or((&text, ""));
|
|
||||||
let status = head
|
|
||||||
.split_whitespace()
|
|
||||||
.nth(1)
|
|
||||||
.and_then(|s| s.parse().ok())
|
|
||||||
.unwrap_or(0);
|
|
||||||
(status, head.to_lowercase(), body.to_owned())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const SHORT: Duration = Duration::from_secs(2);
|
const SHORT: Duration = Duration::from_secs(2);
|
||||||
|
|||||||
+7
-22
@@ -1,4 +1,4 @@
|
|||||||
//! Native TLS tests (WS-I T6): the real `slinuxm` binary serving HTTPS with
|
//! Native TLS tests: the real `slinuxm` binary serving HTTPS with
|
||||||
//! generated self-signed certificates.
|
//! generated self-signed certificates.
|
||||||
|
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
@@ -13,6 +13,8 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
|||||||
use tokio::net::TcpStream;
|
use tokio::net::TcpStream;
|
||||||
use tokio_rustls::TlsConnector;
|
use tokio_rustls::TlsConnector;
|
||||||
|
|
||||||
|
mod common;
|
||||||
|
|
||||||
const BIN: &str = env!("CARGO_BIN_EXE_slinuxm");
|
const BIN: &str = env!("CARGO_BIN_EXE_slinuxm");
|
||||||
|
|
||||||
struct Pair {
|
struct Pair {
|
||||||
@@ -176,18 +178,7 @@ async fn https(
|
|||||||
let der = &conn.peer_certificates().unwrap()[0];
|
let der = &conn.peer_certificates().unwrap()[0];
|
||||||
hex(&Sha256::digest(der.as_ref()))
|
hex(&Sha256::digest(der.as_ref()))
|
||||||
};
|
};
|
||||||
let mut req =
|
let req = common::request(method, path, &format!("localhost:{port}"), headers, body);
|
||||||
format!("{method} {path} HTTP/1.1\r\nHost: localhost:{port}\r\nConnection: close\r\n");
|
|
||||||
for (k, v) in headers {
|
|
||||||
req.push_str(&format!("{k}: {v}\r\n"));
|
|
||||||
}
|
|
||||||
if let Some(b) = body {
|
|
||||||
req.push_str(&format!("Content-Length: {}\r\n", b.len()));
|
|
||||||
}
|
|
||||||
req.push_str("\r\n");
|
|
||||||
if let Some(b) = body {
|
|
||||||
req.push_str(b);
|
|
||||||
}
|
|
||||||
tls.write_all(req.as_bytes()).await.unwrap();
|
tls.write_all(req.as_bytes()).await.unwrap();
|
||||||
let mut buf = Vec::new();
|
let mut buf = Vec::new();
|
||||||
let mut chunk = [0u8; 4096];
|
let mut chunk = [0u8; 4096];
|
||||||
@@ -198,17 +189,11 @@ async fn https(
|
|||||||
Ok(Ok(n)) => buf.extend_from_slice(&chunk[..n]),
|
Ok(Ok(n)) => buf.extend_from_slice(&chunk[..n]),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let text = String::from_utf8_lossy(&buf).into_owned();
|
let (status, head, body) = common::parse_response(&buf);
|
||||||
let (head, body) = text.split_once("\r\n\r\n").unwrap_or((&text, ""));
|
|
||||||
let status = head
|
|
||||||
.split_whitespace()
|
|
||||||
.nth(1)
|
|
||||||
.and_then(|s| s.parse().ok())
|
|
||||||
.unwrap_or(0);
|
|
||||||
Resp {
|
Resp {
|
||||||
status,
|
status,
|
||||||
head: head.to_lowercase(),
|
head,
|
||||||
body: body.to_owned(),
|
body,
|
||||||
peer_fp,
|
peer_fp,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user