Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic for cors cache match

Browse source 
The current logic for a cors cache match does not consider "credentials
is false and request's credentials mode is not "include" or credentials
is true."
This commit is contained in:
Daniel Robertson 2016-04-26 22:36:59 -04:00
parent 47efbea666
commit 153059c55c
No known key found for this signature in database
GPG key ID: 318E3B2F84272FD8
4 changed files with 84 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/fetch/cors_cache.rs
View file

@ -20,7 +20,7 @@ use url::Url;
/// Union type for CORS cache entries
///
/// Each entry might pertain to a header or method
#[derive(Clone)]
#[derive(Clone, Debug)]
pub enum HeaderOrMethod {
HeaderData(String),
MethodData(Method)
@ -43,7 +43,7 @@ impl HeaderOrMethod {
}
/// An entry in the CORS cache
#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct CORSCacheEntry {
pub origin: Origin,
pub url: Url,
@ -112,7 +112,7 @@ pub struct BasicCORSCache(Vec<CORSCacheEntry>);
fn match_headers(cors_cache: &CORSCacheEntry, cors_req: &CacheRequestDetails) -> bool {
cors_cache.origin == cors_req.origin &&
cors_cache.url == cors_req.destination &&
cors_cache.credentials == cors_req.credentials
(cors_cache.credentials || !cors_req.credentials)
}
impl BasicCORSCache {
@ -150,7 +150,7 @@ impl CORSCache for BasicCORSCache {
let BasicCORSCache(buf) = self.clone();
let now = time::now().to_timespec();
let new_buf: Vec<CORSCacheEntry> = buf.into_iter()
.filter(|e| now.sec > e.created.sec + e.max_age as i64)
.filter(|e| now.sec < e.created.sec + e.max_age as i64)
.collect();
*self = BasicCORSCache(new_buf);
}