Skip to content

Commit 77a1948

Browse files
authored
chore(tools/internal/parser): remove unneeded exceptions (#2328)
1 parent 2abdd00 commit 77a1948

File tree

1 file changed

+1
-113
lines changed

1 file changed

+1
-113
lines changed

tools/internal/parser/exceptions.go

Lines changed: 1 addition & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package parser
22

33
import (
44
"slices"
5-
"strings"
65

76
"github.com/creachadair/mds/mapset"
87
"github.com/publicsuffix/list/tools/internal/domain"
@@ -30,15 +29,9 @@ func exemptFromSorting(entity string) bool {
3029
// exemptFromTXT reports whether the given domain name is exempt from
3130
// the requirement to have a _psl TXT record.
3231
func exemptFromTXT(domain domain.Name) bool {
33-
s := domain.String()
3432
if missingTXT.Has(domain.String()) {
3533
return true
3634
}
37-
for _, suffix := range missingTXTAmazonSuffixes {
38-
if strings.HasSuffix(s, suffix) {
39-
return true
40-
}
41-
}
4235
return false
4336
}
4437

@@ -65,7 +58,6 @@ func acceptPRForDomain(domain domain.Name, prNum int) bool {
6558
// that are allowed to lack email contact information.
6659
var missingEmail = []string{
6760
"611 blockchain domain name system",
68-
"c.la",
6961
"co.ca",
7062
"DynDNS.com",
7163
"Hashbang",
@@ -82,85 +74,7 @@ var missingEmail = []string{
8274

8375
// incorrectSort are entities in the private domains section that are
8476
// allowed to be in the wrong sort order.
85-
var incorrectSort = []string{
86-
"AAA workspace",
87-
"University of Banja Luka",
88-
"University of Bielsko-Biala regional domain",
89-
"No longer operated by CentralNic, these entries should be adopted and/or removed by current operators",
90-
"Africa.com Web Solutions Ltd",
91-
"iDOT Services Limited",
92-
"Radix FZC",
93-
"US REGISTRY LLC",
94-
"co.com Registry, LLC",
95-
"Roar Domains LLC",
96-
"BRS Media",
97-
"c.la",
98-
"Clever Cloud",
99-
"co.ca",
100-
"Co & Co",
101-
"i-registry s.r.o.",
102-
"CDN77.com",
103-
"Cloud DNS Ltd",
104-
"Daplie, Inc",
105-
"Datto, Inc.",
106-
"Bip",
107-
"bitbridge.net",
108-
"ddnss.de",
109-
"Definima",
110-
"DigitalOcean App Platform",
111-
"DigitalOcean Spaces",
112-
"DigitalPlat",
113-
"dnstrace.pro",
114-
"ECG Robotics, Inc",
115-
"Fedora",
116-
"Frusky MEDIA&PR",
117-
"RavPage",
118-
"CDDO",
119-
"GOV.UK Platform as a Service",
120-
"GOV.UK Pay",
121-
"Helio Networks",
122-
"Häkkinen.fi",
123-
"is-a.dev",
124-
"I-O DATA DEVICE, INC.",
125-
"KUROKU LTD",
126-
"Katholieke Universiteit Leuven",
127-
".KRD",
128-
"Lokalized",
129-
"May First - People Link",
130-
"mcpe.me",
131-
"NFSN, Inc.",
132-
"NFT.Storage",
133-
"No-IP.com",
134-
"NodeArt",
135-
"One.com",
136-
".pl domains (grandfathered)",
137-
"Pantheon Systems, Inc.",
138-
"PE Ulyanov Kirill Sergeevich",
139-
"Rad Web Hosting",
140-
"Raidboxes GmbH",
141-
"Redgate Software",
142-
"Redstar Consultants",
143-
"Russian Academy of Sciences",
144-
"QA2",
145-
"QCX",
146-
"QNAP System Inc",
147-
"Senseering GmbH",
148-
"Smallregistry by Promopixel SARL",
149-
"staticland",
150-
"Storebase",
151-
"Strapi",
152-
"Strategic System Consulting (eApps Hosting)",
153-
"Sony Interactive Entertainment LLC",
154-
"SourceLair PC",
155-
"SpaceKit",
156-
"SpeedPartner GmbH",
157-
"Spreadshop (sprd.net AG)",
158-
"Studenten Net Twente",
159-
"UNIVERSAL DOMAIN REGISTRY",
160-
".US",
161-
"VeryPositive SIA",
162-
"V.UA Domain Administrator",
163-
}
77+
var incorrectSort = []string{}
16478

16579
// missingTXT are the domains that are exempt from the _psl TXT record
16680
// requirement.
@@ -204,11 +118,8 @@ var missingTXT = mapset.New(
204118
"azurewebsites.net",
205119
"barrell-of-knowledge.info",
206120
"barrel-of-knowledge.info",
207-
"bci.dnstrace.pro",
208121
"beagleboard.io",
209122
"be.eu.org",
210-
"beta.bounty-full.com",
211-
"betainabox.com",
212123
"better-than.tv",
213124
"bg.eu.org",
214125
"biz.at",
@@ -271,7 +182,6 @@ var missingTXT = mapset.New(
271182
"blogspot.lu",
272183
"blogspot.md",
273184
"blogspot.mk",
274-
"blogspot.mr",
275185
"blogspot.mx",
276186
"blogspot.my",
277187
"blogspot.nl",
@@ -301,7 +211,6 @@ var missingTXT = mapset.New(
301211
"casacam.net",
302212
"cd.eu.org",
303213
"cechire.com",
304-
"certmgr.org",
305214
"ch.eu.org",
306215
"cloudapp.net",
307216
"cloudfront.net",
@@ -338,7 +247,6 @@ var missingTXT = mapset.New(
338247
"cyon.link",
339248
"cyon.site",
340249
"cz.eu.org",
341-
"daplie.me",
342250
"ddnsfree.com",
343251
"ddnsgeek.com",
344252
"ddnss.de",
@@ -521,7 +429,6 @@ var missingTXT = mapset.New(
521429
"hepforge.org",
522430
"here-for-more.info",
523431
"herokuapp.com",
524-
"herokussl.com",
525432
"hk.com",
526433
"hk.org",
527434
"hobby-site.com",
@@ -531,7 +438,6 @@ var missingTXT = mapset.New(
531438
"homeftp.net",
532439
"homeftp.org",
533440
"homeip.net",
534-
"homelink.one",
535441
"homelinux.com",
536442
"homelinux.net",
537443
"homelinux.org",
@@ -662,7 +568,6 @@ var missingTXT = mapset.New(
662568
"likescandy.com",
663569
"likes-pie.com",
664570
"lk3.ru",
665-
"localhost.daplie.me",
666571
"loseyourip.com",
667572
"ltd.hk",
668573
"lt.eu.org",
@@ -704,7 +609,6 @@ var missingTXT = mapset.New(
704609
"office-on-the.net",
705610
"onfabrica.com",
706611
"on-rancher.cloud",
707-
"onred.one",
708612
"onrender.com",
709613
"on-rio.io",
710614
"on-the-web.tv",
@@ -714,7 +618,6 @@ var missingTXT = mapset.New(
714618
"ownprovider.com",
715619
"ox.rs",
716620
"pagespeedmobilizer.com",
717-
"paris.eu.org",
718621
"platter-app.com",
719622
"pl.eu.org",
720623
"podzone.net",
@@ -724,7 +627,6 @@ var missingTXT = mapset.New(
724627
"protonet.io",
725628
"pt.eu.org",
726629
"qa2.com",
727-
"q-a.eu.org",
728630
"qbuser.com",
729631
"rackmaze.com",
730632
"rackmaze.net",
@@ -775,14 +677,12 @@ var missingTXT = mapset.New(
775677
"sopot.pl",
776678
"spacekit.io",
777679
"space-to-rent.com",
778-
"staging.onred.one",
779680
"static.observableusercontent.com",
780681
"stg.dev",
781682
"stuff-4-sale.org",
782683
"stuff-4-sale.us",
783684
"synology.me",
784685
"teaches-yoga.com",
785-
"test.ru",
786686
"theworkpc.com",
787687
"thruhere.net",
788688
"tickets.io",
@@ -826,20 +726,8 @@ var missingTXT = mapset.New(
826726
"zakopane.pl",
827727
"za.net",
828728
"za.org",
829-
830-
// Amazon suffixes, managed by a different bulk process.
831-
"amplifyapp.com",
832729
)
833730

834-
// missingTXTAmazonSuffixes are Amazon domains that are exempt from
835-
// the _psl TXT requirement, due to managing their submissions through
836-
// a separate high-volume process.
837-
var missingTXTAmazonSuffixes = []string{
838-
".amazonaws.com",
839-
".amazonaws.com.cn",
840-
".amazoncognito.com",
841-
}
842-
843731
// txtReplacePRs substitutes some TXT PR numbers for
844732
// replacements. This is to paper over some early PSL submissions that
845733
// used the _psl process, where the domain owners complied with all

0 commit comments

Comments
 (0)