Update publicsuffix-go (#4975)

This brings in 14 commits, adds approximately 45
new public suffixes, and removes about 15:
983d101bec...2c0d957a74
This commit is contained in:
Aaron Gable 2020-07-22 10:15:34 -07:00 committed by GitHub
parent 3a03e86e89
commit ffe71f967e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 17 deletions

2
go.mod
View File

@ -25,7 +25,7 @@ require (
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/syndtr/goleveldb v0.0.0-20180331014930-714f901b98fd // indirect
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399
github.com/weppos/publicsuffix-go v0.13.1-0.20200526195454-983d101becd6
github.com/weppos/publicsuffix-go v0.13.1-0.20200721065424-2c0d957a7459
github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf
github.com/zmap/zlint/v2 v2.1.0
golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68

2
go.sum
View File

@ -182,6 +182,8 @@ github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln
github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
github.com/weppos/publicsuffix-go v0.13.1-0.20200526195454-983d101becd6 h1:ZRXyUEzq0HIULzh5VO/7Igju+LG0hGc8u1FX5SWdTcg=
github.com/weppos/publicsuffix-go v0.13.1-0.20200526195454-983d101becd6/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE=
github.com/weppos/publicsuffix-go v0.13.1-0.20200721065424-2c0d957a7459 h1:HSg0sbamo0i1wQa89tIuoUekIeonTumvEOuhlMwNnIU=
github.com/weppos/publicsuffix-go v0.13.1-0.20200721065424-2c0d957a7459/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE=
github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE=

View File

@ -3,13 +3,13 @@
package publicsuffix
const defaultListVersion = "PSL version acb924 (Tue May 26 00:26:48 2020)"
const defaultListVersion = "PSL version 97583a (Mon Jul 20 18:38:50 2020)"
func DefaultRules() [8913]Rule {
func DefaultRules() [8943]Rule {
return r
}
var r = [8913]Rule{
var r = [8943]Rule{
{1, "ac", 1, false},
{1, "com.ac", 2, false},
{1, "edu.ac", 2, false},
@ -212,7 +212,6 @@ var r = [8913]Rule{
{1, "tas.gov.au", 3, false},
{1, "vic.gov.au", 3, false},
{1, "wa.gov.au", 3, false},
{1, "education.tas.edu.au", 4, false},
{1, "schools.nsw.edu.au", 4, false},
{1, "aw", 1, false},
{1, "com.aw", 2, false},
@ -371,6 +370,7 @@ var r = [8913]Rule{
{1, "am.br", 2, false},
{1, "anani.br", 2, false},
{1, "aparecida.br", 2, false},
{1, "app.br", 2, false},
{1, "arq.br", 2, false},
{1, "art.br", 2, false},
{1, "ato.br", 2, false},
@ -378,6 +378,7 @@ var r = [8913]Rule{
{1, "barueri.br", 2, false},
{1, "belem.br", 2, false},
{1, "bhz.br", 2, false},
{1, "bib.br", 2, false},
{1, "bio.br", 2, false},
{1, "blog.br", 2, false},
{1, "bmd.br", 2, false},
@ -392,14 +393,19 @@ var r = [8913]Rule{
{1, "com.br", 2, false},
{1, "contagem.br", 2, false},
{1, "coop.br", 2, false},
{1, "coz.br", 2, false},
{1, "cri.br", 2, false},
{1, "cuiaba.br", 2, false},
{1, "curitiba.br", 2, false},
{1, "def.br", 2, false},
{1, "des.br", 2, false},
{1, "det.br", 2, false},
{1, "dev.br", 2, false},
{1, "ecn.br", 2, false},
{1, "eco.br", 2, false},
{1, "edu.br", 2, false},
{1, "emp.br", 2, false},
{1, "enf.br", 2, false},
{1, "eng.br", 2, false},
{1, "esp.br", 2, false},
{1, "etc.br", 2, false},
@ -415,6 +421,7 @@ var r = [8913]Rule{
{1, "foz.br", 2, false},
{1, "fst.br", 2, false},
{1, "g12.br", 2, false},
{1, "geo.br", 2, false},
{1, "ggf.br", 2, false},
{1, "goiania.br", 2, false},
{1, "gov.br", 2, false},
@ -457,6 +464,7 @@ var r = [8913]Rule{
{1, "jus.br", 2, false},
{1, "leg.br", 2, false},
{1, "lel.br", 2, false},
{1, "log.br", 2, false},
{1, "londrina.br", 2, false},
{1, "macapa.br", 2, false},
{1, "maceio.br", 2, false},
@ -489,6 +497,7 @@ var r = [8913]Rule{
{1, "radio.br", 2, false},
{1, "rec.br", 2, false},
{1, "recife.br", 2, false},
{1, "rep.br", 2, false},
{1, "ribeirao.br", 2, false},
{1, "rio.br", 2, false},
{1, "riobranco.br", 2, false},
@ -499,6 +508,7 @@ var r = [8913]Rule{
{1, "santoandre.br", 2, false},
{1, "saobernardo.br", 2, false},
{1, "saogonca.br", 2, false},
{1, "seg.br", 2, false},
{1, "sjc.br", 2, false},
{1, "slg.br", 2, false},
{1, "slz.br", 2, false},
@ -506,6 +516,7 @@ var r = [8913]Rule{
{1, "srv.br", 2, false},
{1, "taxi.br", 2, false},
{1, "tc.br", 2, false},
{1, "tec.br", 2, false},
{1, "teo.br", 2, false},
{1, "the.br", 2, false},
{1, "tmp.br", 2, false},
@ -5659,7 +5670,6 @@ var r = [8913]Rule{
{1, "dn.ua", 2, false},
{1, "dnepropetrovsk.ua", 2, false},
{1, "dnipropetrovsk.ua", 2, false},
{1, "dominic.ua", 2, false},
{1, "donetsk.ua", 2, false},
{1, "dp.ua", 2, false},
{1, "if.ua", 2, false},
@ -6187,7 +6197,6 @@ var r = [8913]Rule{
{1, "agakhan", 1, false},
{1, "agency", 1, false},
{1, "aig", 1, false},
{1, "aigo", 1, false},
{1, "airbus", 1, false},
{1, "airforce", 1, false},
{1, "airtel", 1, false},
@ -6480,7 +6489,6 @@ var r = [8913]Rule{
{1, "erni", 1, false},
{1, "esq", 1, false},
{1, "estate", 1, false},
{1, "esurance", 1, false},
{1, "etisalat", 1, false},
{1, "eurovision", 1, false},
{1, "eus", 1, false},
@ -7020,7 +7028,6 @@ var r = [8913]Rule{
{1, "schwarz", 1, false},
{1, "science", 1, false},
{1, "scjohnson", 1, false},
{1, "scor", 1, false},
{1, "scot", 1, false},
{1, "search", 1, false},
{1, "seat", 1, false},
@ -7102,7 +7109,6 @@ var r = [8913]Rule{
{1, "swiftcover", 1, false},
{1, "swiss", 1, false},
{1, "sydney", 1, false},
{1, "symantec", 1, false},
{1, "systems", 1, false},
{1, "tab", 1, false},
{1, "taipei", 1, false},
@ -7292,7 +7298,6 @@ var r = [8913]Rule{
{1, "xn--jlq61u9w7b", 1, false},
{1, "xn--jvr189m", 1, false},
{1, "xn--kcrx77d1x4a", 1, false},
{1, "xn--kpu716f", 1, false},
{1, "xn--kput3i", 1, false},
{1, "xn--mgba3a3ejt", 1, false},
{1, "xn--mgba7c0bbn0a", 1, false},
@ -7311,7 +7316,6 @@ var r = [8913]Rule{
{1, "xn--nyqy26a", 1, false},
{1, "xn--otu796d", 1, false},
{1, "xn--p1acf", 1, false},
{1, "xn--pbt977c", 1, false},
{1, "xn--pssy2u", 1, false},
{1, "xn--q9jyb4c", 1, false},
{1, "xn--qcka1pmc", 1, false},
@ -8093,12 +8097,11 @@ var r = [8913]Rule{
{1, "a.ssl.fastly.net", 4, true},
{1, "b.ssl.fastly.net", 4, true},
{1, "global.ssl.fastly.net", 4, true},
{1, "fastpanel.direct", 2, true},
{1, "fastvps-server.com", 2, true},
{1, "myfast.space", 2, true},
{1, "fastvps.host", 2, true},
{1, "myfast.host", 2, true},
{1, "fastvps.site", 2, true},
{1, "fastvps.host", 2, true},
{1, "myfast.space", 2, true},
{1, "fhapp.xyz", 2, true},
{1, "fedorainfracloud.org", 2, true},
{1, "fedorapeople.org", 2, true},
@ -8130,6 +8133,7 @@ var r = [8913]Rule{
{1, "freebox-os.fr", 2, true},
{1, "freeboxos.fr", 2, true},
{1, "freedesktop.org", 2, true},
{1, "wien.funkfeuer.at", 3, true},
{2, "futurecms.at", 3, true},
{2, "ex.futurecms.at", 4, true},
{2, "in.futurecms.at", 4, true},
@ -8147,6 +8151,7 @@ var r = [8913]Rule{
{1, "github.io", 2, true},
{1, "githubusercontent.com", 2, true},
{1, "gitlab.io", 2, true},
{1, "gitpage.si", 2, true},
{1, "glitch.me", 2, true},
{1, "lolipop.io", 2, true},
{1, "cloudapps.digital", 2, true},
@ -8276,6 +8281,7 @@ var r = [8913]Rule{
{1, "ngo.ng", 2, true},
{1, "ng.school", 2, true},
{1, "sch.so", 2, true},
{1, "hostyhosting.io", 2, true},
{1, "xn--hkkinen-5wa.fi", 2, true},
{2, "moonscale.io", 3, true},
{1, "moonscale.net", 2, true},
@ -8327,11 +8333,22 @@ var r = [8913]Rule{
{1, "test-iserv.de", 2, true},
{1, "iserv.dev", 2, true},
{1, "iobb.net", 2, true},
{1, "jele.cloud", 2, true},
{1, "jele.club", 2, true},
{1, "dopaas.com", 2, true},
{1, "hidora.com", 2, true},
{1, "jcloud.ik-server.com", 3, true},
{1, "demo.jelastic.com", 3, true},
{1, "j.scaleforce.com.cy", 4, true},
{1, "jele.host", 2, true},
{1, "mircloud.host", 2, true},
{1, "jele.io", 2, true},
{1, "cloudjiffy.net", 2, true},
{1, "jls-sto1.elastx.net", 3, true},
{1, "jelastic.saveincloud.net", 3, true},
{1, "jelastic.regruhosting.ru", 3, true},
{1, "jele.site", 2, true},
{1, "jelastic.team", 2, true},
{1, "j.layershift.co.uk", 4, true},
{1, "myjino.ru", 2, true},
{2, "hosting.myjino.ru", 4, true},
@ -8427,6 +8444,7 @@ var r = [8913]Rule{
{1, "azurewebsites.net", 2, true},
{1, "azure-mobile.net", 2, true},
{1, "cloudapp.net", 2, true},
{1, "csx.cc", 2, true},
{1, "mozilla-iot.org", 2, true},
{1, "bmoattachments.org", 2, true},
{1, "net.ru", 2, true},
@ -8624,6 +8642,7 @@ var r = [8913]Rule{
{1, "cya.gg", 2, true},
{1, "cloudycluster.net", 2, true},
{1, "nid.io", 2, true},
{1, "opensocial.site", 2, true},
{1, "opencraft.hosting", 2, true},
{1, "operaunite.com", 2, true},
{1, "skygearapp.com", 2, true},
@ -8635,6 +8654,7 @@ var r = [8913]Rule{
{1, "oy.lc", 2, true},
{1, "pgfog.com", 2, true},
{1, "pagefrontapp.com", 2, true},
{1, "pagexl.com", 2, true},
{1, "art.pl", 2, true},
{1, "gliwice.pl", 2, true},
{1, "krakow.pl", 2, true},
@ -8646,13 +8666,17 @@ var r = [8913]Rule{
{1, "mypep.link", 2, true},
{1, "perspecta.cloud", 2, true},
{1, "on-web.fr", 2, true},
{2, "platform.sh", 3, true},
{1, "bc.platform.sh", 3, true},
{1, "ent.platform.sh", 3, true},
{1, "eu.platform.sh", 3, true},
{1, "us.platform.sh", 3, true},
{2, "platformsh.site", 3, true},
{1, "platter-app.com", 2, true},
{1, "platter-app.dev", 2, true},
{1, "platterp.us", 2, true},
{1, "pdns.page", 2, true},
{1, "plesk.page", 2, true},
{1, "pleskns.com", 2, true},
{1, "dyn53.io", 2, true},
{1, "co.bn", 2, true},
{1, "xen.prgmr.com", 3, true},
@ -8678,6 +8702,7 @@ var r = [8913]Rule{
{1, "vaporcloud.io", 2, true},
{1, "rackmaze.com", 2, true},
{1, "rackmaze.net", 2, true},
{1, "g.vbrplsbx.io", 3, true},
{2, "on-k3s.io", 3, true},
{2, "on-rancher.cloud", 3, true},
{2, "on-rio.io", 3, true},
@ -8885,6 +8910,7 @@ var r = [8913]Rule{
{1, "wedeploy.me", 2, true},
{1, "wedeploy.sh", 2, true},
{1, "remotewd.com", 2, true},
{1, "pages.wiardweb.com", 3, true},
{1, "wmflabs.org", 2, true},
{1, "toolforge.org", 2, true},
{1, "wmcloud.org", 2, true},
@ -8895,6 +8921,7 @@ var r = [8913]Rule{
{1, "diskussionsbereich.de", 2, true},
{1, "community-pro.net", 2, true},
{1, "meinforum.net", 2, true},
{1, "cn.vu", 2, true},
{1, "half.host", 2, true},
{1, "xnbay.com", 2, true},
{1, "u2.xnbay.com", 3, true},
@ -8923,6 +8950,9 @@ var r = [8913]Rule{
{1, "virtualserver.io", 2, true},
{1, "enterprisecloud.nu", 2, true},
{1, "mintere.site", 2, true},
{1, "wpenginepowered.com", 2, true},
{1, "impertrixcdn.com", 2, true},
{1, "impertrix.com", 2, true},
}
func init() {

2
vendor/modules.txt vendored
View File

@ -94,7 +94,7 @@ github.com/syndtr/goleveldb/leveldb/table
github.com/syndtr/goleveldb/leveldb/util
# github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399
github.com/titanous/rocacheck
# github.com/weppos/publicsuffix-go v0.13.1-0.20200526195454-983d101becd6
# github.com/weppos/publicsuffix-go v0.13.1-0.20200721065424-2c0d957a7459
github.com/weppos/publicsuffix-go/publicsuffix
# github.com/zmap/zcrypto v0.0.0-20191112190257-7f2fe6faf8cf
github.com/zmap/zcrypto/json