1033340 - Uplift recent PSL changes to Firefox 24

Status: VERIFIED FIXED

(Firefox :: General, defect)

Description

[Gervase Markham [:gerv]]

+++ This bug was initially created as a clone of Bug #1024964 +++

We recently made two large batches of changes to the Public Suffix List, clearing a several-month backlog. These changes included a change for .uk to reflect the fact that they have now gone live with top-level registration. .uk is a busy TLD, and errors here will get noticed. The impact if the uplift doesn't happen is that sites using the new wibble.uk domain names may not be able to set cookies across their multiple servers. 

We should uplift the current PSL file en masse to Firefox 24. The file is known to pass tests on mozilla-central and so the risk is minimal.

Here's the .uk change:
https://hg.mozilla.org/mozilla-central/rev/8597415940ed
although I'd want to take the file wholesale, including all the updates.

Gerv

Comment 1

[Gervase Markham [:gerv]]

Attachment: Patch v.1

This patch ports the current trunk PSL to ESR 24. Because the ESR 24 branch is old, there are quite a few changes. However, this PSL file has been tested on trunk, and was recently uplifted to Aurora and Beta in bug 1024964.

Gerv

Comment 2

[Gervase Markham [:gerv]]

Comment on attachment 8449372 [details] [diff] [review]
Patch v.1

[Approval Request Comment]
If this is not a sec:{high,crit} bug, please state case for ESR consideration:

-- The most high-profile issue is that the new foo.uk domains are having cookie-setting problems. But almost all of these changes fix a problem for someone somewhere.

User impact if declined: 

-- See above.

Fix Landed on Version:

-- Already on central, aurora and beta.

Risk to taking this patch (and alternatives if risky): 

-- Low - static data file, already in use on all other current branches.

String or UUID changes made by this patch: 

-- None.

Gerv

Comment 3

[Lukas Blakk [:lsblakk] use ?needinfo]

Comment on attachment 8449372 [details] [diff] [review]
Patch v.1

We only have two more ESR24 but can take this since it's low risk and has positive impact to the channel.

Comment 4

[Lukas Blakk [:lsblakk] use ?needinfo]

Not tracking since this is not actually a concern for ESR to the level of tracking.

Comment 5

[Gervase Markham [:gerv]]

https://hg.mozilla.org/releases/mozilla-esr24/rev/34182c54281a

Gerv

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Backed out for xpcshell failures.
https://hg.mozilla.org/releases/mozilla-esr24/rev/2b3f7b7180e7

https://tbpl.mozilla.org/php/getParsedLog.php?id=43051763&tree=Mozilla-Esr24

Comment 7

[Gervase Markham [:gerv]]

Thanks, Ryan. Sorry about that. My machine can't build ESR24 at the moment; I will soon order a new SSD so I can move to a 64-bit OS. I assumed this was simple, and in one sense it is - the list is fine, and the code will parse it fine. It's just the wretched test which needs fiddling. The stuff which is breaking is not the PSL, it's test infra.

Gerv

Comment 8

[:Gijs (he/him)]

Backing out the backout (ie recommitting the previous 3 csets landed for this bug), and adding:

const Cc = Components.classes;
const Ci = Components.interfaces;

at the top of the test_psl.js file makes this test pass on my local copy of esr24 (on mac).

FWIW, the debug (but not opt, because... opt?) failures indicate:

ReferenceError: Cc is not defined

e.g. https://tbpl.mozilla.org/php/getParsedLog.php?id=43053178&tree=Mozilla-Esr24

These were all added in head_cache2.js for the http cache v2 that was added "relatively recently" ( bug 913807, https://hg.mozilla.org/mozilla-central/rev/0c91d9aa9476 ).

I don't believe there's anything else necessary to fix this up, judging from tbpl, and I can be around on Monday to help out if you're comfortable relanding then, Gerv? :-)

Comment 9

[:Gijs (he/him)]

Stealing per discussion on IRC.

Comment 10

[:Gijs (he/him)]

Attachment: , uplift PSL changes to ESR 24,

In fact, these two lines are already in the test, but the uplift of the test changes removed them... so this is a single commit that folds the 3 that landed on esr24 originally, minus the removal of the Cc and Ci declarations.

Comment 11

[Gervase Markham [:gerv]]

Comment on attachment 8452289 [details] [diff] [review]
, uplift PSL changes to ESR 24,

LGTM. The test did pass, right? :-)

Gerv

Comment 12

[:Gijs (he/him)]

(In reply to Gervase Markham [:gerv] from comment #11)
> Comment on attachment 8452289 [details] [diff] [review]
> , uplift PSL changes to ESR 24,
> 
> LGTM. The test did pass, right? :-)
> 
> Gerv

Yup.

remote:   https://hg.mozilla.org/releases/mozilla-esr24/rev/9f424948b2aa

Comment 13

[Kamil Jozwiak [:kjozwiak]]

I pulled changeset 31b0c1ff3c0b and ensured that "effective_tld_names.dat" located under "/home/kjozwiak/mozilla/mozilla-esr24/netwerk/dns" matched the patch that has been provided in comment #1.

Because there are so many changes, I went through about half of them and ensured that they were present in the current changeset. Checked the ones that had the bigger changes associated with them like .uk, .ar and .it.