Private browsing student project #10690
+163
−38
Private browsing with tests
- Loading branch information
commit 769e0eabe4ec21947f3d220a21d50eb140b1d8ae
| @@ -17,10 +17,11 @@ use hyper::header::{ContentType, Header, SetCookie}; | ||
| use hyper::mime::{Mime, SubLevel, TopLevel}; | ||
| use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; | ||
| use mime_classifier::{ApacheBugFlag, MIMEClassifier, NoSniffFlag}; | ||
| use msg::constellation_msg::{ConstellationChan, PipelineId}; | ||
| use net_traits::LoadContext; | ||
| use net_traits::ProgressMsg::Done; | ||
| use net_traits::{AsyncResponseTarget, Metadata, ProgressMsg, ResourceThread, ResponseAction}; | ||
| use net_traits::{ControlMsg, CookieSource, LoadConsumer, LoadData, LoadResponse, ResourceId}; | ||
| use net_traits::{ControlMsg, ConstellationMsg, CookieSource, LoadConsumer, LoadData, LoadResponse, ResourceId}; | ||
| use net_traits::{NetworkError, WebSocketCommunicate, WebSocketConnectData}; | ||
| use rustc_serialize::json; | ||
| use rustc_serialize::{Decodable, Encodable}; | ||
| @@ -45,6 +46,14 @@ pub enum ProgressSender { | ||
| Listener(AsyncResponseTarget), | ||
| } | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct ResourceGroup { | ||
| cookie_jar: Arc<RwLock<CookieStorage>>, | ||
| auth_cache: Arc<RwLock<AuthCache>>, | ||
| hsts_list: Arc<RwLock<HstsList>>, | ||
| connector: Arc<Pool<Connector>>, | ||
| } | ||
|
|
||
| impl ProgressSender { | ||
| //XXXjdm return actual error | ||
| pub fn send(&self, msg: ProgressMsg) -> Result<(), ()> { | ||
| @@ -178,12 +187,12 @@ impl ResourceChannelManager { | ||
| match self.from_client.recv().unwrap() { | ||
| ControlMsg::Load(load_data, consumer, id_sender) => | ||
| self.resource_manager.load(load_data, consumer, id_sender, control_sender.clone()), | ||
| ControlMsg::WebsocketConnect(connect, connect_data) => | ||
| self.resource_manager.websocket_connect(connect, connect_data), | ||
| ControlMsg::SetCookiesForUrl(request, cookie_list, source) => | ||
| self.resource_manager.set_cookies_for_url(request, cookie_list, source), | ||
| ControlMsg::GetCookiesForUrl(url, consumer, source) => { | ||
| let cookie_jar = &self.resource_manager.cookie_jar; | ||
| ControlMsg::WebsocketConnect(pipeline_id, connect, connect_data) => | ||
| self.resource_manager.websocket_connect(pipeline_id, connect, connect_data), | ||
| ControlMsg::SetCookiesForUrl(pipeline_id, request, cookie_list, source) => | ||
| self.resource_manager.set_cookies_for_url(pipeline_id, request, cookie_list, source), | ||
| ControlMsg::GetCookiesForUrl(pipeline_id, url, consumer, source) => { | ||
| let cookie_jar = &self.resource_manager.get_resource_group(Some(pipeline_id)).cookie_jar; | ||
| let mut cookie_jar = cookie_jar.write().unwrap(); | ||
| consumer.send(cookie_jar.cookies_for_url(&url, source)).unwrap(); | ||
| } | ||
| @@ -196,17 +205,22 @@ impl ResourceChannelManager { | ||
| ControlMsg::Synchronize(sender) => { | ||
| let _ = sender.send(()); | ||
| } | ||
| ControlMsg::SendConstellationMsgChannel(sender) => { | ||
| self.resource_manager.constellation_msg_chan = Some(sender); | ||
| } | ||
| ControlMsg::Exit => { | ||
| let resource_grp = self.resource_manager.get_resource_group(None); | ||
| let cookie_jar = resource_grp.cookie_jar; | ||
| if let Some(ref profile_dir) = opts::get().profile_dir { | ||
| match self.resource_manager.auth_cache.read() { | ||
| match resource_grp.auth_cache.read() { | ||
| Ok(auth_cache) => write_json_to_file(&*auth_cache, profile_dir, "auth_cache.json"), | ||
| Err(_) => warn!("Error writing auth cache to disk"), | ||
| } | ||
| match self.resource_manager.cookie_jar.read() { | ||
| match cookie_jar.read() { | ||
| Ok(jar) => write_json_to_file(&*jar, profile_dir, "cookie_jar.json"), | ||
| Err(_) => warn!("Error writing cookie jar to disk"), | ||
| } | ||
| match self.resource_manager.hsts_list.read() { | ||
| match resource_grp.hsts_list.read() { | ||
| Ok(hsts) => write_json_to_file(&*hsts, profile_dir, "hsts_list.json"), | ||
| Err(_) => warn!("Error writing hsts list to disk"), | ||
| } | ||
| @@ -359,14 +373,13 @@ pub struct AuthCache { | ||
|
|
||
| pub struct ResourceManager { | ||
| user_agent: String, | ||
| cookie_jar: Arc<RwLock<CookieStorage>>, | ||
| auth_cache: Arc<RwLock<AuthCache>>, | ||
| mime_classifier: Arc<MIMEClassifier>, | ||
| devtools_chan: Option<Sender<DevtoolsControlMsg>>, | ||
| hsts_list: Arc<RwLock<HstsList>>, | ||
| connector: Arc<Pool<Connector>>, | ||
| cancel_load_map: HashMap<ResourceId, Sender<()>>, | ||
| next_resource_id: ResourceId, | ||
| constellation_msg_chan: Option<ConstellationChan<ConstellationMsg>>, | ||
| resource_group: ResourceGroup, | ||
| private_resource_group: ResourceGroup, | ||
| } | ||
|
|
||
| impl ResourceManager { | ||
| @@ -380,25 +393,40 @@ impl ResourceManager { | ||
| read_json_from_file(&mut hsts_list, profile_dir, "hsts_list.json"); | ||
| read_json_from_file(&mut cookie_jar, profile_dir, "cookie_jar.json"); | ||
| } | ||
| ResourceManager { | ||
| user_agent: user_agent, | ||
| let resource_group = ResourceGroup { | ||
| cookie_jar: Arc::new(RwLock::new(cookie_jar)), | ||
| auth_cache: Arc::new(RwLock::new(auth_cache)), | ||
| hsts_list: Arc::new(RwLock::new(hsts_list.clone())), | ||
| connector: create_http_connector(), | ||
| }; | ||
| let private_resource_group = ResourceGroup { | ||
| cookie_jar: Arc::new(RwLock::new(CookieStorage::new())), | ||
| auth_cache: Arc::new(RwLock::new(AuthCache::new())), | ||
| hsts_list: Arc::new(RwLock::new(HstsList::new())), | ||
| connector: create_http_connector(), | ||
| }; | ||
| ResourceManager { | ||
| user_agent: user_agent, | ||
| mime_classifier: Arc::new(MIMEClassifier::new()), | ||
| devtools_chan: devtools_channel, | ||
| hsts_list: Arc::new(RwLock::new(hsts_list)), | ||
| connector: create_http_connector(), | ||
| cancel_load_map: HashMap::new(), | ||
| next_resource_id: ResourceId(0), | ||
| constellation_msg_chan: None, | ||
| resource_group: resource_group, | ||
| private_resource_group: private_resource_group, | ||
| } | ||
| } | ||
|
|
||
| fn set_cookies_for_url(&mut self, request: Url, cookie_list: String, source: CookieSource) { | ||
| fn set_cookies_for_url(&mut self, | ||
| pipeline_id: PipelineId, | ||
| request: Url, | ||
| cookie_list: String, | ||
| source: CookieSource) { | ||
| let header = Header::parse_header(&[cookie_list.into_bytes()]); | ||
| if let Ok(SetCookie(cookies)) = header { | ||
| for bare_cookie in cookies { | ||
| if let Some(cookie) = cookie::Cookie::new_wrapped(bare_cookie, &request, source) { | ||
| let cookie_jar = &self.cookie_jar; | ||
| let cookie_jar = &self.get_resource_group(Some(pipeline_id)).cookie_jar; | ||
| let mut cookie_jar = cookie_jar.write().unwrap(); | ||
| cookie_jar.push(cookie, source); | ||
| } | ||
| @@ -436,15 +464,16 @@ impl ResourceManager { | ||
| "chrome" => from_factory(chrome_loader::factory), | ||
| "file" => from_factory(file_loader::factory), | ||
| "http" | "https" | "view-source" => { | ||
| let resource_grp = self.get_resource_group(load_data.pipeline_id); | ||
|
||
| let http_state = HttpState { | ||
| hsts_list: self.hsts_list.clone(), | ||
| cookie_jar: self.cookie_jar.clone(), | ||
| auth_cache: self.auth_cache.clone() | ||
| hsts_list: resource_grp.hsts_list.clone(), | ||
| cookie_jar: resource_grp.cookie_jar.clone(), | ||
| auth_cache: resource_grp.auth_cache.clone() | ||
| }; | ||
| http_loader::factory(self.user_agent.clone(), | ||
| http_state, | ||
| self.devtools_chan.clone(), | ||
| self.connector.clone()) | ||
| resource_grp.connector.clone()) | ||
| }, | ||
| "data" => from_factory(data_loader::factory), | ||
| "about" => from_factory(about_loader::factory), | ||
| @@ -463,8 +492,26 @@ impl ResourceManager { | ||
| } | ||
|
|
||
| fn websocket_connect(&self, | ||
| pipeline_id: PipelineId, | ||
| connect: WebSocketCommunicate, | ||
| connect_data: WebSocketConnectData) { | ||
| websocket_loader::init(connect, connect_data, self.cookie_jar.clone()); | ||
| let resource_grp = self.get_resource_group(Some(pipeline_id)); | ||
| websocket_loader::init(connect, connect_data, resource_grp.cookie_jar); | ||
| } | ||
|
|
||
| fn get_resource_group(&self, pipeline_id: Option<PipelineId>) -> ResourceGroup { | ||
| let is_private = match pipeline_id { | ||
| Some(id) => { | ||
| let (tx, rx) = ipc::channel::<bool>().unwrap(); | ||
| let ConstellationChan(ref chan) = self.constellation_msg_chan.clone().unwrap(); | ||
| let _ = chan.send(ConstellationMsg::IsPrivate(id, tx)); | ||
| rx.recv().unwrap() | ||
| }, | ||
| None => false | ||
| }; | ||
| match is_private { | ||
| true => self.private_resource_group.clone(), | ||
| false => self.resource_group.clone(), | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Er. It's disconcerting that the test (presumably) passes right now, since this message will not be sent until Servo is in the process of shutting down -
runis an endless loop.