starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-09-10 03:41:52 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Preserve request body across 307/308 redirects

Browse Source 
Clone Bytes bodies before sending so they can be resent on 307/308
Preserve redirects. For stream bodies that can't be replayed, return
an error instead of silently dropping the body. Also fix dropped_body
metadata to accurately reflect whether the body was actually dropped.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Gregory Schier
2026-03-04 15:51:29 -08:00
co-authored by Claude Opus 4.6
parent ae98a71294
commit 7063c356cc
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/yaak-http/src/transaction.rs
+22 -6
View File
@@ -1,7 +1,7 @@
use crate::cookies::CookieStore;
use crate::error::Result;
use crate::sender::{HttpResponse, HttpResponseEvent, HttpSender, RedirectBehavior};
use crate::types::SendableHttpRequest;
use crate::types::{SendableBody, SendableHttpRequest};
use log::debug;
use tokio::sync::mpsc;
use tokio::sync::watch::Receiver;
@@ -87,6 +87,10 @@ impl<S: HttpSender> HttpTransaction<S> {
};
// Build request for this iteration
let preserved_body = match &current_body {
Some(SendableBody::Bytes(b)) => Some(SendableBody::Bytes(b.clone())),
_ => None,
};
let request_had_body = current_body.is_some();
let req = SendableHttpRequest {
url: current_url.clone(),
@@ -216,7 +220,23 @@ impl<S: HttpSender> HttpTransaction<S> {
});
}
let dropped_body = matches!(behavior, RedirectBehavior::DropBody) && request_had_body;
// Restore body for Preserve redirects (307/308), drop for others.
// Stream bodies can't be replayed (same limitation as reqwest).
current_body = if matches!(behavior, RedirectBehavior::Preserve) {
if request_had_body && preserved_body.is_none() {
// Stream body was consumed and can't be replayed (same as reqwest)
return Err(crate::error::Error::RequestError(
"Cannot follow redirect: request body was a stream and cannot be resent"
.to_string(),
));
}
preserved_body
} else {
None
};
// Body was dropped if the request had one but we can't resend it
let dropped_body = request_had_body && current_body.is_none();
send_event(HttpResponseEvent::Redirect {
url: current_url.clone(),
@@ -226,10 +246,6 @@ impl<S: HttpSender> HttpTransaction<S> {
dropped_headers,
});
// Reset body for next iteration (since it was moved in the send call)
// For redirects that change method to GET or for all redirects since body was consumed
current_body = None;
redirect_count += 1;
}
}