berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

handle redirects without Location header

This commit is contained in:
Mohsen Alizadeh 2021-05-23 16:32:12 +02:00
parent b1de196509
commit 8c1e8d0a83
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
awc/src/middleware/redirect.rs
View File

@ -156,7 +156,7 @@ where
StatusCode::MOVED_PERMANENTLY
| StatusCode::FOUND
| StatusCode::SEE_OTHER
if *max_redirect_times > 0 =>
if *max_redirect_times > 0 && res.headers().contains_key(header::LOCATION) =>
{
let org_uri = uri.take().unwrap();
// rebuild uri from the location header value.
@ -203,7 +203,7 @@ where
self.poll(cx)
}
StatusCode::TEMPORARY_REDIRECT | StatusCode::PERMANENT_REDIRECT
if *max_redirect_times > 0 =>
if *max_redirect_times > 0 && res.headers().contains_key(header::LOCATION) =>
{
let org_uri = uri.take().unwrap();
// rebuild uri from the location header value.
@ -314,6 +314,30 @@ mod tests {
assert_eq!(res.status().as_u16(), 400);
}
#[actix_rt::test]
async fn test_redirect_without_location() {
let client = ClientBuilder::new()
.disable_redirects()
.wrap(Redirect::new().max_redirect_times(10))
.finish();
let srv = actix_test::start(|| {
App::new()
.service(web::resource("/test").route(web::to(|| async {
Ok::<_, Error>(HttpResponse::BadRequest())
})))
.service(web::resource("/").route(web::to(|| async {
Ok::<_, Error>(
HttpResponse::Found().finish(),
)
})))
});
let res = client.get(srv.url("/")).send().await.unwrap();
assert_eq!(res.status().as_u16(), 302);
}
#[actix_rt::test]
async fn test_redirect_limit() {
let client = ClientBuilder::new()