committed by
Sean McArthur
parent
7bd3619ece
commit
c417d6dab8
@@ -12,10 +12,10 @@ fn test_redirect_301_and_302_and_303_changes_post_to_get() {
|
||||
let redirect = server! {
|
||||
request: format!("\
|
||||
POST /{} HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
", code),
|
||||
response: format!("\
|
||||
@@ -29,11 +29,11 @@ fn test_redirect_301_and_302_and_303_changes_post_to_get() {
|
||||
|
||||
request: format!("\
|
||||
GET /dst HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
Referer: http://$HOST/{}\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
referer: http://$HOST/{}\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
", code),
|
||||
response: b"\
|
||||
@@ -50,9 +50,8 @@ fn test_redirect_301_and_302_and_303_changes_post_to_get() {
|
||||
.send()
|
||||
.unwrap();
|
||||
assert_eq!(res.url().as_str(), dst);
|
||||
assert_eq!(res.status(), reqwest::StatusCode::Ok);
|
||||
assert_eq!(res.headers().get(),
|
||||
Some(&reqwest::header::Server::new("test-dst".to_string())));
|
||||
assert_eq!(res.status(), reqwest::StatusCode::OK);
|
||||
assert_eq!(res.headers().get(reqwest::header::SERVER).unwrap(), &"test-dst");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,10 +63,10 @@ fn test_redirect_307_and_308_tries_to_get_again() {
|
||||
let redirect = server! {
|
||||
request: format!("\
|
||||
GET /{} HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
", code),
|
||||
response: format!("\
|
||||
@@ -81,11 +80,11 @@ fn test_redirect_307_and_308_tries_to_get_again() {
|
||||
|
||||
request: format!("\
|
||||
GET /dst HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
Referer: http://$HOST/{}\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
referer: http://$HOST/{}\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
", code),
|
||||
response: b"\
|
||||
@@ -102,9 +101,8 @@ fn test_redirect_307_and_308_tries_to_get_again() {
|
||||
.send()
|
||||
.unwrap();
|
||||
assert_eq!(res.url().as_str(), dst);
|
||||
assert_eq!(res.status(), reqwest::StatusCode::Ok);
|
||||
assert_eq!(res.headers().get(),
|
||||
Some(&reqwest::header::Server::new("test-dst".to_string())));
|
||||
assert_eq!(res.status(), reqwest::StatusCode::OK);
|
||||
assert_eq!(res.headers().get(reqwest::header::SERVER).unwrap(), &"test-dst");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,11 +114,11 @@ fn test_redirect_307_and_308_tries_to_post_again() {
|
||||
let redirect = server! {
|
||||
request: format!("\
|
||||
POST /{} HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Content-Length: 5\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
content-length: 5\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
Hello\
|
||||
", code),
|
||||
@@ -135,12 +133,12 @@ fn test_redirect_307_and_308_tries_to_post_again() {
|
||||
|
||||
request: format!("\
|
||||
POST /dst HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Content-Length: 5\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
Referer: http://$HOST/{}\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
content-length: 5\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
referer: http://$HOST/{}\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
Hello\
|
||||
", code),
|
||||
@@ -159,9 +157,8 @@ fn test_redirect_307_and_308_tries_to_post_again() {
|
||||
.send()
|
||||
.unwrap();
|
||||
assert_eq!(res.url().as_str(), dst);
|
||||
assert_eq!(res.status(), reqwest::StatusCode::Ok);
|
||||
assert_eq!(res.headers().get(),
|
||||
Some(&reqwest::header::Server::new("test-dst".to_string())));
|
||||
assert_eq!(res.status(), reqwest::StatusCode::OK);
|
||||
assert_eq!(res.headers().get(reqwest::header::SERVER).unwrap(), &"test-dst");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -173,11 +170,11 @@ fn test_redirect_307_does_not_try_if_reader_cannot_reset() {
|
||||
let redirect = server! {
|
||||
request: format!("\
|
||||
POST /{} HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
Transfer-Encoding: chunked\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
transfer-encoding: chunked\r\n\
|
||||
\r\n\
|
||||
5\r\n\
|
||||
Hello\r\n\
|
||||
@@ -200,7 +197,7 @@ fn test_redirect_307_does_not_try_if_reader_cannot_reset() {
|
||||
.send()
|
||||
.unwrap();
|
||||
assert_eq!(res.url().as_str(), url);
|
||||
assert_eq!(res.status(), reqwest::StatusCode::try_from(code).unwrap());
|
||||
assert_eq!(res.status(), reqwest::StatusCode::from_u16(code).unwrap());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,10 +208,10 @@ fn test_redirect_removes_sensitive_headers() {
|
||||
let end_server = server! {
|
||||
request: b"\
|
||||
GET /otherhost HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: b"\
|
||||
@@ -228,11 +225,11 @@ fn test_redirect_removes_sensitive_headers() {
|
||||
let mid_server = server! {
|
||||
request: b"\
|
||||
GET /sensitive HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Cookie: foo=bar\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
cookie: foo=bar\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: format!("\
|
||||
@@ -244,14 +241,12 @@ fn test_redirect_removes_sensitive_headers() {
|
||||
", end_server.addr())
|
||||
};
|
||||
|
||||
let mut cookie = reqwest::header::Cookie::new();
|
||||
cookie.set("foo", "bar");
|
||||
reqwest::Client::builder()
|
||||
.referer(false)
|
||||
.build()
|
||||
.unwrap()
|
||||
.get(&format!("http://{}/sensitive", mid_server.addr()))
|
||||
.header(cookie)
|
||||
.header(reqwest::header::COOKIE, reqwest::header::HeaderValue::from_static("foo=bar"))
|
||||
.send()
|
||||
.unwrap();
|
||||
}
|
||||
@@ -261,10 +256,10 @@ fn test_redirect_policy_can_return_errors() {
|
||||
let server = server! {
|
||||
request: b"\
|
||||
GET /loop HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: b"\
|
||||
@@ -285,10 +280,10 @@ fn test_redirect_policy_can_stop_redirects_without_an_error() {
|
||||
let server = server! {
|
||||
request: b"\
|
||||
GET /no-redirect HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: b"\
|
||||
@@ -311,9 +306,8 @@ fn test_redirect_policy_can_stop_redirects_without_an_error() {
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(res.url().as_str(), url);
|
||||
assert_eq!(res.status(), reqwest::StatusCode::Found);
|
||||
assert_eq!(res.headers().get(),
|
||||
Some(&reqwest::header::Server::new("test-dont".to_string())));
|
||||
assert_eq!(res.status(), reqwest::StatusCode::FOUND);
|
||||
assert_eq!(res.headers().get(reqwest::header::SERVER).unwrap(), &"test-dont");
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -321,10 +315,10 @@ fn test_referer_is_not_set_if_disabled() {
|
||||
let server = server! {
|
||||
request: b"\
|
||||
GET /no-refer HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: b"\
|
||||
@@ -338,10 +332,10 @@ fn test_referer_is_not_set_if_disabled() {
|
||||
|
||||
request: b"\
|
||||
GET /dst HTTP/1.1\r\n\
|
||||
Host: $HOST\r\n\
|
||||
User-Agent: $USERAGENT\r\n\
|
||||
Accept: */*\r\n\
|
||||
Accept-Encoding: gzip\r\n\
|
||||
user-agent: $USERAGENT\r\n\
|
||||
accept: */*\r\n\
|
||||
accept-encoding: gzip\r\n\
|
||||
host: $HOST\r\n\
|
||||
\r\n\
|
||||
",
|
||||
response: b"\
|
||||
|
||||
Reference in New Issue
Block a user