Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "testangel-http"
version = "0.1.0"
version = "0.1.1"
edition = "2024"

[lib]
Expand Down
10 changes: 5 additions & 5 deletions src/http_evidence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ pub fn req_to_evidence(req: &Request) -> String {
// SAFETY: */* is always valid
headers.append("accept", HeaderValue::from_str("*/*").unwrap());
}
if !headers.contains_key("host") {
if let Some(host) = req.url().host_str() {
// SAFETY: host is always a valid string
headers.append("host", HeaderValue::from_str(host).unwrap());
}
if !headers.contains_key("host")
&& let Some(host) = req.url().host_str()
{
// SAFETY: host is always a valid string
headers.append("host", HeaderValue::from_str(host).unwrap());
}
let headers = headers_to_evidence(&headers);
let body = req.body();
Expand Down
12 changes: 7 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ engine! {
version = env!("CARGO_PKG_VERSION"),
)]
#[derive(Default)]
struct HTTP {
struct Http {
/// The reqwest client
client: reqwest::blocking::Client,

Expand All @@ -36,7 +36,7 @@ engine! {
builder: Option<Mutex<RequestBuilder>>,
}

impl HTTP {
impl Http {
#[instruction(
name = "Prepare GET Request",
flags = InstructionFlags::INFALLIBLE | InstructionFlags::AUTOMATIC,
Expand Down Expand Up @@ -121,15 +121,17 @@ engine! {
if let Some(builder) = state.builder.take() {
let (cl, req) = builder.into_inner().build_split();
let req = req?;
evidence.push(Evidence { label: "HTTP Request".to_string(), content: EvidenceContent::Textual(req_to_evidence(&req)) });

let url = req.url().to_string();
let req_ev = req_to_evidence(&req);
let res = cl.execute(req)?;

// Store last request values
state.last_status = Some(res.status());
state.last_headers = Some(res.headers().clone());
let mut body = String::new();
evidence.push(Evidence { label: "HTTP Response".to_string(), content: EvidenceContent::Textual(res_to_evidence(res, &mut body)) });
let res_ev = res_to_evidence(res, &mut body);

evidence.push(Evidence { label: format!("Request to {url}"), content: EvidenceContent::HttpRequestResponse(req_ev, res_ev) });

body
} else {
Expand Down