Closed
Bug 1015214
Opened 10 years ago
Closed 10 years ago
Update PSL for .uk
Categories
(Core Graveyard :: Networking: Domain Lists, defect)
Core Graveyard
Networking: Domain Lists
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla33
People
(Reporter: gerv, Assigned: gerv)
References
Details
Attachments
(1 file, 3 obsolete files)
845 bytes,
patch
|
gerv
:
review+
|
Details | Diff | Splinter Review |
Michael Daly writes: Please can you apply the following diff to the public suffix list - this is part of our work to allow SLDR registrations nomint-diff-20140522.txt --- effective_tld_names.dat_ORIG 2014-05-20 08:58:19.000000000 +0100 +++ effective_tld_names.dat 2014-05-20 09:00:49.000000000 +0100 @@ -6152,17 +6152,19 @@ // uk : http://en.wikipedia.org/wiki/.uk // Submitted by registry <noc@nominet.org.uk> 2012-10-02 // and tweaked by us pending further consultation. -*.uk +uk +ac.uk +co.uk +gov.uk +ltd.uk +me.uk +net.uk +nhs.uk +org.uk +plc.uk +police.uk +sch.uk *.sch.uk -!bl.uk -!british-library.uk -!jet.uk -!mod.uk -!national-library-scotland.uk -!nel.uk -!nic.uk -!nls.uk -!parliament.uk // us : http://en.wikipedia.org/wiki/.us us Gerv
Assignee | ||
Comment 1•10 years ago
|
||
Updated•10 years ago
|
Assignee: nobody → weppos
Status: NEW → ASSIGNED
Comment 2•10 years ago
|
||
Attachment #8427789 -
Attachment is obsolete: true
Attachment #8434183 -
Flags: review?(gerv)
Comment 3•10 years ago
|
||
I created the patch, however it's not clear to me the reason to include both sch.uk *.sch.uk I'm pinging the registry to get some information.
Assignee | ||
Comment 4•10 years ago
|
||
Comment on attachment 8434183 [details] [diff] [review] UK.patch We can take both *.sch.uk and sch.uk for now; whether we need them is under discussion. Gerv
Attachment #8434183 -
Flags: review?(gerv) → review+
Assignee | ||
Comment 5•10 years ago
|
||
See also bug 1023367. Gerv
Comment 6•10 years ago
|
||
Try says this is busted. https://tbpl.mozilla.org/php/getParsedLog.php?id=41465951&tree=Try
Flags: needinfo?(weppos)
Assignee | ||
Comment 7•10 years ago
|
||
The update is fine; it's the prepare_tlds.py script that's busted. It doesn't understand how to compare two rules for equality. It thinks *.sch.uk and sch.uk are the same rule, when they are clearly not. Gerv
Assignee | ||
Comment 8•10 years ago
|
||
This patch makes the .uk changes, and also fixes prepare_tlds.py to not die when it sees *.sch.uk and sch.uk in the same file. It now knows how to compare two rules properly. Gerv
Attachment #8434183 -
Attachment is obsolete: true
Attachment #8438410 -
Flags: review+
Assignee | ||
Comment 9•10 years ago
|
||
Test to verify: apply the patch, then run: python ./netwerk/dns/prepare_tlds.py netwerk/dns/effective_tld_names.dat It should run to completion, with a lot of output. Gerv
Comment 10•10 years ago
|
||
prepare_tlds.py itself runs fine (see below diff on the generated output). However, I am a bit concerned about the two sch.uk entries: ETLD_ENTRY("sch.uk", false, false) ETLD_ENTRY("sch.uk", false, true) wouldn't the mHash.PutEntry(domain) call on nsEffectiveTLDService::Init() overwrite the former entry with the later? That would explain that prepare_tlds.py were erroring on that. @@ -5257,13 +5257,14 @@ ETLD_ENTRY("org.ug", false, false) -ETLD_ENTRY("uk", false, true) +ETLD_ENTRY("ac.uk", false, false) +ETLD_ENTRY("co.uk", false, false) +ETLD_ENTRY("gov.uk", false, false) +ETLD_ENTRY("ltd.uk", false, false) +ETLD_ENTRY("me.uk", false, false) +ETLD_ENTRY("net.uk", false, false) +ETLD_ENTRY("nhs.uk", false, false) +ETLD_ENTRY("org.uk", false, false) +ETLD_ENTRY("plc.uk", false, false) +ETLD_ENTRY("police.uk", false, false) +ETLD_ENTRY("sch.uk", false, false) ETLD_ENTRY("sch.uk", false, true) -ETLD_ENTRY("bl.uk", true, false) -ETLD_ENTRY("british-library.uk", true, false) -ETLD_ENTRY("jet.uk", true, false) -ETLD_ENTRY("mod.uk", true, false) -ETLD_ENTRY("national-library-scotland.uk", true, false) -ETLD_ENTRY("nel.uk", true, false) -ETLD_ENTRY("nic.uk", true, false) -ETLD_ENTRY("nls.uk", true, false) -ETLD_ENTRY("parliament.uk", true, false) ETLD_ENTRY("dni.us", false, false)
Assignee | ||
Comment 11•10 years ago
|
||
Ángel: blimey, well spotted. It looks like our Firefox code doesn't know how to distinguish two clearly-different rules either! Given that, and the need to get this patch in, I think we should just decide to not add sch.uk for now. The possible problem with spoofing is possible, but it's unlikely. Gerv
Assignee | ||
Comment 12•10 years ago
|
||
Assignee: weppos → gerv
Attachment #8438410 -
Attachment is obsolete: true
Attachment #8439201 -
Flags: review+
https://hg.mozilla.org/mozilla-central/rev/8597415940ed
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla33
Updated•1 month ago
|
Product: Core → Core Graveyard
You need to log in
before you can comment on or make changes to this bug.
Description
•