mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Rustfmt net crate
This commit is contained in:
Pyfisch
parent
ba1ed11ced
commit
2481ad25f8
30 changed files with 4957 additions and 2870 deletions
|
|
@ -118,11 +118,13 @@ fn test_cookie_secure_prefix() {
|
|||
assert!(Cookie::new_wrapped(cookie, url, CookieSource::HTTP).is_none());
|
||||
|
||||
let url = &ServoUrl::parse("http://example.com").unwrap();
|
||||
let cookie = cookie_rs::Cookie::parse("__Secure-SID=12345; Secure; Domain=example.com").unwrap();
|
||||
let cookie =
|
||||
cookie_rs::Cookie::parse("__Secure-SID=12345; Secure; Domain=example.com").unwrap();
|
||||
assert!(Cookie::new_wrapped(cookie, url, CookieSource::HTTP).is_none());
|
||||
|
||||
let url = &ServoUrl::parse("https://example.com").unwrap();
|
||||
let cookie = cookie_rs::Cookie::parse("__Secure-SID=12345; Secure; Domain=example.com").unwrap();
|
||||
let cookie =
|
||||
cookie_rs::Cookie::parse("__Secure-SID=12345; Secure; Domain=example.com").unwrap();
|
||||
assert!(Cookie::new_wrapped(cookie, url, CookieSource::HTTP).is_some());
|
||||
}
|
||||
|
||||
|
|
@ -157,7 +159,8 @@ fn test_cookie_host_prefix() {
|
|||
assert!(Cookie::new_wrapped(cookie, url, CookieSource::HTTP).is_none());
|
||||
|
||||
let url = &ServoUrl::parse("https://example.com").unwrap();
|
||||
let cookie = cookie_rs::Cookie::parse("__Host-SID=12345; Secure; Domain=example.com; Path=/").unwrap();
|
||||
let cookie =
|
||||
cookie_rs::Cookie::parse("__Host-SID=12345; Secure; Domain=example.com; Path=/").unwrap();
|
||||
assert!(Cookie::new_wrapped(cookie, url, CookieSource::HTTP).is_none());
|
||||
|
||||
let url = &ServoUrl::parse("https://example.com").unwrap();
|
||||
|
|
@ -193,13 +196,18 @@ fn test_sort_order() {
|
|||
assert!(b.cookie.path().as_ref().unwrap().len() > a.cookie.path().as_ref().unwrap().len());
|
||||
assert_eq!(CookieStorage::cookie_comparator(&a, &b), Ordering::Greater);
|
||||
assert_eq!(CookieStorage::cookie_comparator(&b, &a), Ordering::Less);
|
||||
assert_eq!(CookieStorage::cookie_comparator(&a, &a_prime), Ordering::Less);
|
||||
assert_eq!(CookieStorage::cookie_comparator(&a_prime, &a), Ordering::Greater);
|
||||
assert_eq!(
|
||||
CookieStorage::cookie_comparator(&a, &a_prime),
|
||||
Ordering::Less
|
||||
);
|
||||
assert_eq!(
|
||||
CookieStorage::cookie_comparator(&a_prime, &a),
|
||||
Ordering::Greater
|
||||
);
|
||||
assert_eq!(CookieStorage::cookie_comparator(&a, &a), Ordering::Equal);
|
||||
}
|
||||
|
||||
fn add_cookie_to_storage(storage: &mut CookieStorage, url: &ServoUrl, cookie_str: &str)
|
||||
{
|
||||
fn add_cookie_to_storage(storage: &mut CookieStorage, url: &ServoUrl, cookie_str: &str) {
|
||||
let source = CookieSource::HTTP;
|
||||
let cookie = cookie_rs::Cookie::parse(cookie_str.to_owned()).unwrap();
|
||||
let cookie = Cookie::new_wrapped(cookie, url, source).unwrap();
|
||||
|
|
@ -225,21 +233,40 @@ fn test_insecure_cookies_cannot_evict_secure_cookie() {
|
|||
|
||||
let insecure_url = ServoUrl::parse("http://home.example.org:8888/cookie-parser?0001").unwrap();
|
||||
|
||||
add_cookie_to_storage(&mut storage, &insecure_url, "foo=value; Domain=home.example.org");
|
||||
add_cookie_to_storage(&mut storage, &insecure_url, "foo2=value; Domain=.example.org");
|
||||
add_cookie_to_storage(
|
||||
&mut storage,
|
||||
&insecure_url,
|
||||
"foo=value; Domain=home.example.org",
|
||||
);
|
||||
add_cookie_to_storage(
|
||||
&mut storage,
|
||||
&insecure_url,
|
||||
"foo2=value; Domain=.example.org",
|
||||
);
|
||||
add_cookie_to_storage(&mut storage, &insecure_url, "foo3=value; Path=/foo/bar");
|
||||
add_cookie_to_storage(&mut storage, &insecure_url, "foo4=value; Path=/foo");
|
||||
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&secure_url, source).unwrap(), "foo=bar; foo2=bar");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&secure_url, source).unwrap(),
|
||||
"foo=bar; foo2=bar"
|
||||
);
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo3=bar; foo4=value; foo=bar; foo2=bar");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo3=bar; foo4=value; foo=bar; foo2=bar"
|
||||
);
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo4=bar; foo3=bar; foo4=value; foo=bar; foo2=bar");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo4=bar; foo3=bar; foo4=value; foo=bar; foo2=bar"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -267,14 +294,21 @@ fn test_secure_cookies_eviction() {
|
|||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo2=value");
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo3=bar; foo4=value; foo2=value");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo3=bar; foo4=value; foo2=value"
|
||||
);
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo4=bar; foo3=value; foo3=bar; foo4=value; foo2=value");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo4=bar; foo3=value; foo3=bar; foo4=value; foo2=value"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -302,21 +336,28 @@ fn test_secure_cookies_eviction_non_http_source() {
|
|||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo2=value");
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(), "foo3=bar; foo4=value; foo2=value");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo3=bar; foo4=value; foo2=value"
|
||||
);
|
||||
|
||||
let url = ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let url =
|
||||
ServoUrl::parse("https://home.example.org:8888/foo/bar/cookie-parser-result?0001").unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
assert_eq!(storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo4=bar; foo3=value; foo3=bar; foo4=value; foo2=value");
|
||||
assert_eq!(
|
||||
storage.cookies_for_url(&url, source).unwrap(),
|
||||
"foo4=bar; foo3=value; foo3=bar; foo4=value; foo2=value"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
fn add_retrieve_cookies(set_location: &str,
|
||||
set_cookies: &[String],
|
||||
final_location: &str)
|
||||
-> String {
|
||||
fn add_retrieve_cookies(
|
||||
set_location: &str,
|
||||
set_cookies: &[String],
|
||||
final_location: &str,
|
||||
) -> String {
|
||||
let mut storage = CookieStorage::new(5);
|
||||
let url = ServoUrl::parse(set_location).unwrap();
|
||||
let source = CookieSource::HTTP;
|
||||
|
|
@ -329,56 +370,75 @@ fn add_retrieve_cookies(set_location: &str,
|
|||
|
||||
// Get cookies for the test location
|
||||
let url = ServoUrl::parse(final_location).unwrap();
|
||||
storage.cookies_for_url(&url, source).unwrap_or("".to_string())
|
||||
storage
|
||||
.cookies_for_url(&url, source)
|
||||
.unwrap_or("".to_string())
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_cookie_eviction_expired() {
|
||||
let mut vec = Vec::new();
|
||||
for i in 1..6 {
|
||||
let st = format!("extra{}=bar; Secure; expires=Sun, 18-Apr-2000 21:06:29 GMT",
|
||||
i);
|
||||
let st = format!(
|
||||
"extra{}=bar; Secure; expires=Sun, 18-Apr-2000 21:06:29 GMT",
|
||||
i
|
||||
);
|
||||
vec.push(st);
|
||||
}
|
||||
vec.push("foo=bar; Secure; expires=Sun, 18-Apr-2027 21:06:29 GMT".to_owned());
|
||||
let r = add_retrieve_cookies("https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec, "https://home.example.org:8888/cookie-parser-result?0001");
|
||||
let r = add_retrieve_cookies(
|
||||
"https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec,
|
||||
"https://home.example.org:8888/cookie-parser-result?0001",
|
||||
);
|
||||
assert_eq!(&r, "foo=bar");
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_cookie_eviction_all_secure_one_nonsecure() {
|
||||
let mut vec = Vec::new();
|
||||
for i in 1..5 {
|
||||
let st = format!("extra{}=bar; Secure; expires=Sun, 18-Apr-2026 21:06:29 GMT",
|
||||
i);
|
||||
let st = format!(
|
||||
"extra{}=bar; Secure; expires=Sun, 18-Apr-2026 21:06:29 GMT",
|
||||
i
|
||||
);
|
||||
vec.push(st);
|
||||
}
|
||||
vec.push("foo=bar; expires=Sun, 18-Apr-2026 21:06:29 GMT".to_owned());
|
||||
vec.push("foo2=bar; Secure; expires=Sun, 18-Apr-2028 21:06:29 GMT".to_owned());
|
||||
let r = add_retrieve_cookies("https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec, "https://home.example.org:8888/cookie-parser-result?0001");
|
||||
assert_eq!(&r, "extra1=bar; extra2=bar; extra3=bar; extra4=bar; foo2=bar");
|
||||
let r = add_retrieve_cookies(
|
||||
"https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec,
|
||||
"https://home.example.org:8888/cookie-parser-result?0001",
|
||||
);
|
||||
assert_eq!(
|
||||
&r,
|
||||
"extra1=bar; extra2=bar; extra3=bar; extra4=bar; foo2=bar"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_cookie_eviction_all_secure_new_nonsecure() {
|
||||
let mut vec = Vec::new();
|
||||
for i in 1..6 {
|
||||
let st = format!("extra{}=bar; Secure; expires=Sun, 18-Apr-2026 21:06:29 GMT",
|
||||
i);
|
||||
let st = format!(
|
||||
"extra{}=bar; Secure; expires=Sun, 18-Apr-2026 21:06:29 GMT",
|
||||
i
|
||||
);
|
||||
vec.push(st);
|
||||
}
|
||||
vec.push("foo=bar; expires=Sun, 18-Apr-2077 21:06:29 GMT".to_owned());
|
||||
let r = add_retrieve_cookies("https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec, "https://home.example.org:8888/cookie-parser-result?0001");
|
||||
assert_eq!(&r, "extra1=bar; extra2=bar; extra3=bar; extra4=bar; extra5=bar");
|
||||
let r = add_retrieve_cookies(
|
||||
"https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec,
|
||||
"https://home.example.org:8888/cookie-parser-result?0001",
|
||||
);
|
||||
assert_eq!(
|
||||
&r,
|
||||
"extra1=bar; extra2=bar; extra3=bar; extra4=bar; extra5=bar"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_cookie_eviction_all_nonsecure_new_secure() {
|
||||
let mut vec = Vec::new();
|
||||
|
|
@ -387,12 +447,17 @@ fn test_cookie_eviction_all_nonsecure_new_secure() {
|
|||
vec.push(st);
|
||||
}
|
||||
vec.push("foo=bar; Secure; expires=Sun, 18-Apr-2077 21:06:29 GMT".to_owned());
|
||||
let r = add_retrieve_cookies("https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec, "https://home.example.org:8888/cookie-parser-result?0001");
|
||||
assert_eq!(&r, "extra2=bar; extra3=bar; extra4=bar; extra5=bar; foo=bar");
|
||||
let r = add_retrieve_cookies(
|
||||
"https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec,
|
||||
"https://home.example.org:8888/cookie-parser-result?0001",
|
||||
);
|
||||
assert_eq!(
|
||||
&r,
|
||||
"extra2=bar; extra3=bar; extra4=bar; extra5=bar; foo=bar"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_cookie_eviction_all_nonsecure_new_nonsecure() {
|
||||
let mut vec = Vec::new();
|
||||
|
|
@ -401,7 +466,13 @@ fn test_cookie_eviction_all_nonsecure_new_nonsecure() {
|
|||
vec.push(st);
|
||||
}
|
||||
vec.push("foo=bar; expires=Sun, 18-Apr-2077 21:06:29 GMT".to_owned());
|
||||
let r = add_retrieve_cookies("https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec, "https://home.example.org:8888/cookie-parser-result?0001");
|
||||
assert_eq!(&r, "extra2=bar; extra3=bar; extra4=bar; extra5=bar; foo=bar");
|
||||
let r = add_retrieve_cookies(
|
||||
"https://home.example.org:8888/cookie-parser?0001",
|
||||
&vec,
|
||||
"https://home.example.org:8888/cookie-parser-result?0001",
|
||||
);
|
||||
assert_eq!(
|
||||
&r,
|
||||
"extra2=bar; extra3=bar; extra4=bar; extra5=bar; foo=bar"
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue