read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present #10800

DDEFISHER · 2016-04-21T23:44:16Z

Last step in Persistent sessions student project

"check for the presence of the profile directory command-line option in the ResourceThread constructor and look for files that will contain serialized versions of the previous steps. If they exist, populate the appropriate fields with deserialized versions of the file contents."

Also populated local_data in StorageManager constructor

I am not sure if the handling of decoding and encoding the Option Tm type was done in the cleanest way here.

This change is

highfive · 2016-04-21T23:44:19Z

Heads up! This PR modifies the following files:

@KiChjang: components/net/storage_thread.rs, components/net/resource_thread.rs, components/net/cookie_storage.rs, components/net/cookie.rs

highfive · 2016-04-21T23:44:20Z

Warning

These commits modify net code, but no tests are modified. Please consider adding a test!

DDEFISHER · 2016-04-22T00:07:32Z

fixed tidy errors

Manishearth · 2016-04-22T15:19:08Z

The encoding can be done in a much cleaner way by using RsCookie inside Cookie and just sticking #[derive(Encodable,Decodable)] on top of it. Implementations of Encodable/Decodable are rarely manually written.

Actually, I think it might be better to just make cookie::Cookie serializable by sticking that derive annotation on it here

Manishearth · 2016-04-22T15:20:06Z

Also, I'm going to be busy the next few days due to exams. r? @jdm

(or anyone else)

DDEFISHER · 2016-04-22T16:53:29Z

Sounds good I will make a pull request to add the derive annotation to Cookie and Tm

frewsxcv · 2016-04-22T16:58:13Z

Looks great, thanks!

@bors-servo r+

bors-servo · 2016-04-22T16:58:15Z

📌 Commit 1a35d75 has been approved by frewsxcv

Manishearth · 2016-04-22T16:59:19Z

@bors-servo r-

Not till the manual impls go away 😄

DDEFISHER · 2016-04-23T01:47:43Z

Does the fact that components/net is using version 2.0 of cookie:Cookie present a problem to adding the derive to the Cookie struct in cookie:Cookie since it is on version 2.3 ?

frewsxcv · 2016-04-23T01:50:37Z

I don't see any reason why we couldn't upgrade to version 2.3. Just need to make the changes upstream to cookie-rs, then run ./mach cargo-update -p cookie

frewsxcv · 2016-04-25T18:16:18Z

A new version of the cookie crate has been pushed.

DDEFISHER · 2016-04-25T18:40:21Z

Thanks for the heads up!

frewsxcv · 2016-04-25T19:00:57Z

Ping me when you get around to updating this (GitHub does send notifications for new pushes). Thanks!

DDEFISHER · 2016-04-25T20:12:09Z

looks like I will have to rebase

frewsxcv · 2016-04-25T20:25:27Z

thread '<main>' panicked at 'a package was referenced twice in the lockfile', src/cargo/core/resolver/encode.rs:51

DDEFISHER · 2016-04-25T20:26:20Z

Sorry I am fixing this now

frewsxcv · 2016-04-25T22:00:03Z

Thanks again!

@bors-servo r+

bors-servo · 2016-04-25T22:00:04Z

📌 Commit d6c06c2 has been approved by frewsxcv

bors-servo · 2016-04-25T22:31:47Z

⌛ Testing commit d6c06c2 with merge abd1e5a...


        Auto merge of #10800 - DDEFISHER:read_profile_dir_from_file, r=frewsxcv

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present Last step in Persistent sessions student project "check for the presence of the profile directory command-line option in the ResourceThread constructor and look for files that will contain serialized versions of the previous steps. If they exist, populate the appropriate fields with deserialized versions of the file contents." Also populated local_data in StorageManager constructor I am not sure if the handling of decoding and encoding the Option Tm type was done in the cleanest way here.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10800)

bors-servo · 2016-04-25T22:43:46Z

💔 Test failed - linux-dev

KiChjang · 2016-04-25T22:46:25Z

thread '<main>' panicked at 'a package was referenced twice in the lockfile', src/cargo/core/resolver/encode.rs:51

frewsxcv · 2016-04-25T23:27:37Z

Looks like cef and gonk lockfiles also need updating.


        read cookie_jar, hsts_list, auth_cache, and local_data from file if p…

…rofile_dir option is present

frewsxcv · 2016-04-26T01:10:38Z

@bors-servo r+

bors-servo · 2016-04-26T01:10:39Z

📌 Commit d9c32b2 has been approved by frewsxcv

bors-servo · 2016-04-26T01:10:41Z

⌛ Testing commit d9c32b2 with merge 7a582b4...


        Auto merge of #10800 - DDEFISHER:read_profile_dir_from_file, r=frewsxcv

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present Last step in Persistent sessions student project "check for the presence of the profile directory command-line option in the ResourceThread constructor and look for files that will contain serialized versions of the previous steps. If they exist, populate the appropriate fields with deserialized versions of the file contents." Also populated local_data in StorageManager constructor I am not sure if the handling of decoding and encoding the Option Tm type was done in the cleanest way here.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10800)

bors-servo · 2016-04-26T02:11:13Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt


        Changes after rebase with servo#10800


        Changes after rebase with servo#10800


        Changes after rebase with servo#10800

highfive assigned Manishearth Apr 21, 2016

highfive added the S-awaiting-review label Apr 21, 2016

jdm assigned jdm and unassigned Manishearth Apr 21, 2016

frewsxcv assigned frewsxcv and unassigned jdm Apr 22, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 22, 2016

DDEFISHER mentioned this pull request Apr 23, 2016

Add RuctcEncdoable and RustcDecodable to derive attribute for Cookie SergioBenitez/cookie-rs#44

Merged

frewsxcv mentioned this pull request Apr 23, 2016

Extract out 'net/storage_thread' into separate components. #10768

Closed

Ms2ger added the S-blocked-on-external label Apr 25, 2016

frewsxcv removed the S-blocked-on-external label Apr 25, 2016

frewsxcv added S-needs-code-changes and removed S-awaiting-merge labels Apr 25, 2016

highfive added S-awaiting-review and removed S-needs-code-changes labels Apr 25, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 25, 2016

highfive added S-tests-failed and removed S-awaiting-merge labels Apr 25, 2016

read cookie_jar, hsts_list, auth_cache, and local_data from file if p…

Loading status checks…

d9c32b2

…rofile_dir option is present

highfive added S-awaiting-review and removed S-tests-failed labels Apr 25, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 26, 2016

bors-servo merged commit d9c32b2 into servo:master Apr 26, 2016
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Apr 26, 2016

bors-servo mentioned this pull request Apr 26, 2016

Private browsing student project #10690

Closed

srm09 added a commit to srm09/servo that referenced this pull request Apr 26, 2016

Changes after rebase with servo#10800

63f9487

srm09 added a commit to srm09/servo that referenced this pull request Apr 29, 2016

Changes after rebase with servo#10800

f7722f1

srm09 added a commit to srm09/servo that referenced this pull request Apr 29, 2016

Changes after rebase with servo#10800

0df968e

servo / servo

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present #10800

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present #10800

DDEFISHER commented Apr 21, 2016 •

edited

highfive commented Apr 21, 2016

highfive commented Apr 21, 2016

DDEFISHER commented Apr 22, 2016

Manishearth commented Apr 22, 2016 •

edited

Manishearth commented Apr 22, 2016

DDEFISHER commented Apr 22, 2016

frewsxcv commented Apr 22, 2016

bors-servo commented Apr 22, 2016

Manishearth commented Apr 22, 2016

DDEFISHER commented Apr 23, 2016 •

edited

frewsxcv commented Apr 23, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

bors-servo commented Apr 25, 2016

bors-servo commented Apr 25, 2016

bors-servo commented Apr 25, 2016

KiChjang commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

frewsxcv commented Apr 26, 2016

bors-servo commented Apr 26, 2016

bors-servo commented Apr 26, 2016

bors-servo commented Apr 26, 2016

servo / servo

Join GitHub today

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present #10800

read cookie_jar, hsts_list, auth_cache, and local_data from file if profile_dir option is present #10800

Conversation

DDEFISHER commented Apr 21, 2016 • edited

highfive commented Apr 21, 2016

highfive commented Apr 21, 2016

DDEFISHER commented Apr 22, 2016

Manishearth commented Apr 22, 2016 • edited

Manishearth commented Apr 22, 2016

DDEFISHER commented Apr 22, 2016

frewsxcv commented Apr 22, 2016

bors-servo commented Apr 22, 2016

Manishearth commented Apr 22, 2016

DDEFISHER commented Apr 23, 2016 • edited

frewsxcv commented Apr 23, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

DDEFISHER commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

bors-servo commented Apr 25, 2016

bors-servo commented Apr 25, 2016

bors-servo commented Apr 25, 2016

KiChjang commented Apr 25, 2016

frewsxcv commented Apr 25, 2016

frewsxcv commented Apr 26, 2016

bors-servo commented Apr 26, 2016

bors-servo commented Apr 26, 2016

bors-servo commented Apr 26, 2016

DDEFISHER commented Apr 21, 2016 •

edited

Manishearth commented Apr 22, 2016 •

edited

DDEFISHER commented Apr 23, 2016 •

edited