Skip to content

Commit 1f1fa29

Browse files
committed
publicsuffix: regenerate table
Updated to revision 2c960dac3d39ba521eb5db9da192968f5be0aded (2025-03-18T07:22:13Z). Last updated on 2023-08 xn--czrw28b.tw / 商業.tw was removed in publicsuffix/list#2289 blogspot ccTLDs were removed in publicsuffix/list#2327 Change-Id: I749d014ab667502d9a112e0be645413ec6a7a66e Reviewed-on: https://go-review.googlesource.com/c/net/+/659276 Reviewed-by: Damien Neil <[email protected]> Reviewed-by: Cherry Mui <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 1215081 commit 1f1fa29

File tree

8 files changed

+3107
-1705
lines changed

8 files changed

+3107
-1705
lines changed

Diff for: publicsuffix/data/children

508 Bytes
Binary file not shown.

Diff for: publicsuffix/data/nodes

3.8 KB
Binary file not shown.

Diff for: publicsuffix/data/text

+1-1
Large diffs are not rendered by default.

Diff for: publicsuffix/example_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ func ExamplePublicSuffix_manager() {
4242
"foo.org",
4343
"foo.co.uk",
4444
"foo.dyndns.org",
45-
"foo.blogspot.co.uk",
4645
"cromulent",
4746
}
4847

@@ -88,6 +87,5 @@ func ExamplePublicSuffix_manager() {
8887
// > foo.org org is ICANN Managed
8988
// > foo.co.uk co.uk is ICANN Managed
9089
// > foo.dyndns.org dyndns.org is Privately Managed
91-
// > foo.blogspot.co.uk blogspot.co.uk is Privately Managed
9290
// > cromulent cromulent is Unmanaged
9391
}

Diff for: publicsuffix/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (list) String() string {
7777
// privately managed domain (and in practice, not a top level domain) or an
7878
// unmanaged top level domain (and not explicitly mentioned in the
7979
// publicsuffix.org list). For example, "foo.org" and "foo.co.uk" are ICANN
80-
// domains, "foo.dyndns.org" and "foo.blogspot.co.uk" are private domains and
80+
// domains, "foo.dyndns.org" is a private domain and
8181
// "cromulent" is an unmanaged top level domain.
8282
//
8383
// Use cases for distinguishing ICANN domains like "foo.com" from private

Diff for: publicsuffix/list_test.go

+9-25
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ func TestFind(t *testing.T) {
6363

6464
func TestICANN(t *testing.T) {
6565
testCases := map[string]bool{
66-
"foo.org": true,
67-
"foo.co.uk": true,
68-
"foo.dyndns.org": false,
69-
"foo.go.dyndns.org": false,
70-
"foo.blogspot.co.uk": false,
71-
"foo.intranet": false,
66+
"foo.org": true,
67+
"foo.co.uk": true,
68+
"foo.dyndns.org": false,
69+
"foo.go.dyndns.org": false,
70+
"foo.intranet": false,
7271
}
7372
for domain, want := range testCases {
7473
_, got := PublicSuffix(domain)
@@ -111,16 +110,12 @@ var publicSuffixTestCases = []struct {
111110
// net.ar
112111
// org.ar
113112
// tur.ar
114-
// blogspot.com.ar (in the PRIVATE DOMAIN section).
115113
{"ar", "ar", true},
116114
{"www.ar", "ar", true},
117115
{"nic.ar", "ar", true},
118116
{"www.nic.ar", "ar", true},
119117
{"com.ar", "com.ar", true},
120118
{"www.com.ar", "com.ar", true},
121-
{"blogspot.com.ar", "blogspot.com.ar", false}, // PRIVATE DOMAIN.
122-
{"www.blogspot.com.ar", "blogspot.com.ar", false}, // PRIVATE DOMAIN.
123-
{"www.xxx.yyy.zzz.blogspot.com.ar", "blogspot.com.ar", false}, // PRIVATE DOMAIN.
124119
{"logspot.com.ar", "com.ar", true},
125120
{"zlogspot.com.ar", "com.ar", true},
126121
{"zblogspot.com.ar", "com.ar", true},
@@ -170,20 +165,13 @@ var publicSuffixTestCases = []struct {
170165
// game.tw
171166
// ebiz.tw
172167
// club.tw
173-
// 網路.tw (xn--zf0ao64a.tw)
174-
// 組織.tw (xn--uc0atv.tw)
175-
// 商業.tw (xn--czrw28b.tw)
176-
// blogspot.tw
168+
// 台灣.tw (xn--kpry57d.tw)
177169
{"tw", "tw", true},
178170
{"aaa.tw", "tw", true},
179171
{"www.aaa.tw", "tw", true},
180172
{"xn--czrw28b.aaa.tw", "tw", true},
181173
{"edu.tw", "edu.tw", true},
182174
{"www.edu.tw", "edu.tw", true},
183-
{"xn--czrw28b.edu.tw", "edu.tw", true},
184-
{"xn--czrw28b.tw", "xn--czrw28b.tw", true},
185-
{"www.xn--czrw28b.tw", "xn--czrw28b.tw", true},
186-
{"xn--uc0atv.xn--czrw28b.tw", "xn--czrw28b.tw", true},
187175
{"xn--kpry57d.tw", "tw", true},
188176

189177
// The .uk rules are:
@@ -199,7 +187,6 @@ var publicSuffixTestCases = []struct {
199187
// plc.uk
200188
// police.uk
201189
// *.sch.uk
202-
// blogspot.co.uk (in the PRIVATE DOMAIN section).
203190
{"uk", "uk", true},
204191
{"aaa.uk", "uk", true},
205192
{"www.aaa.uk", "uk", true},
@@ -210,9 +197,6 @@ var publicSuffixTestCases = []struct {
210197
{"www.sch.uk", "www.sch.uk", true},
211198
{"co.uk", "co.uk", true},
212199
{"www.co.uk", "co.uk", true},
213-
{"blogspot.co.uk", "blogspot.co.uk", false}, // PRIVATE DOMAIN.
214-
{"blogspot.nic.uk", "uk", true},
215-
{"blogspot.sch.uk", "blogspot.sch.uk", true},
216200

217201
// The .рф rules are
218202
// рф (xn--p1ai)
@@ -322,10 +306,10 @@ func TestNumICANNRules(t *testing.T) {
322306
// Check the last ICANN and first Private rules. If the underlying public
323307
// suffix list changes, we may need to update these hard-coded checks.
324308
if got, want := rules[numICANNRules-1], "zuerich"; got != want {
325-
t.Errorf("last ICANN rule: got %q, wawnt %q", got, want)
309+
t.Errorf("last ICANN rule: got %q, want %q", got, want)
326310
}
327-
if got, want := rules[numICANNRules], "cc.ua"; got != want {
328-
t.Errorf("first Private rule: got %q, wawnt %q", got, want)
311+
if got, want := rules[numICANNRules], "co.krd"; got != want {
312+
t.Errorf("first Private rule: got %q, want %q", got, want)
329313
}
330314
}
331315

Diff for: publicsuffix/table.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package publicsuffix
44

55
import _ "embed"
66

7-
const version = "publicsuffix.org's public_suffix_list.dat, git revision 63cbc63d470d7b52c35266aa96c4c98c96ec499c (2023-08-03T10:01:25Z)"
7+
const version = "publicsuffix.org's public_suffix_list.dat, git revision 2c960dac3d39ba521eb5db9da192968f5be0aded (2025-03-18T07:22:13Z)"
88

99
const (
1010
nodesBits = 40
@@ -26,7 +26,7 @@ const (
2626
)
2727

2828
// numTLD is the number of top level domains.
29-
const numTLD = 1474
29+
const numTLD = 1454
3030

3131
// text is the combined text of all labels.
3232
//
@@ -63,8 +63,8 @@ var nodes uint40String
6363
//go:embed data/children
6464
var children uint32String
6565

66-
// max children 743 (capacity 1023)
67-
// max text offset 30876 (capacity 65535)
66+
// max children 870 (capacity 1023)
67+
// max text offset 31785 (capacity 65535)
6868
// max text length 31 (capacity 63)
69-
// max hi 9322 (capacity 16383)
70-
// max lo 9317 (capacity 16383)
69+
// max hi 10100 (capacity 16383)
70+
// max lo 10095 (capacity 16383)

0 commit comments

Comments
 (0)