diff options
| author | Gregory Terzian <gterzian@users.noreply.github.com> | 2020-02-13 00:18:14 +0800 |
|---|---|---|
| committer | Gregory Terzian <gterzian@users.noreply.github.com> | 2020-02-21 14:26:45 +0800 |
| commit | 895500e68cf62e53754fdb9f43c818e022bf0b47 (patch) | |
| tree | e1ad6f68706f68d82024cbda15364fd2cf0fe712 /components/net/fetch/methods.rs | |
| parent | 4c5ec9da27b4ff1e7175d9f1e8994d7ba0922b3d (diff) | |
| download | servo-895500e68cf62e53754fdb9f43c818e022bf0b47.tar.gz servo-895500e68cf62e53754fdb9f43c818e022bf0b47.zip | |
add a fetch token for blob urls
Diffstat (limited to 'components/net/fetch/methods.rs')
| -rw-r--r-- | components/net/fetch/methods.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index 55cef372c1b..c1736c42c5e 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -18,7 +18,7 @@ use hyper::StatusCode; use ipc_channel::ipc::IpcReceiver; use mime::{self, Mime}; use net_traits::blob_url_store::{parse_blob_url, BlobURLStoreError}; -use net_traits::filemanager_thread::RelativePos; +use net_traits::filemanager_thread::{FileTokenCheck, RelativePos}; use net_traits::request::{ is_cors_safelisted_method, is_cors_safelisted_request_header, Origin, ResponseTainting, Window, }; @@ -56,6 +56,7 @@ pub struct FetchContext { pub user_agent: Cow<'static, str>, pub devtools_chan: Option<Sender<DevtoolsControlMsg>>, pub filemanager: FileManager, + pub file_token: FileTokenCheck, pub cancellation_listener: Arc<Mutex<CancellationListener>>, pub timing: ServoArc<Mutex<ResourceFetchTiming>>, } @@ -755,12 +756,12 @@ fn scheme_fetch( let (done_sender, done_receiver) = unbounded(); *done_chan = Some((done_sender.clone(), done_receiver)); *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]); - let check_url_validity = true; + if let Err(err) = context.filemanager.fetch_file( &done_sender, context.cancellation_listener.clone(), id, - check_url_validity, + &context.file_token, origin, &mut response, range, |