From a67237adaabbfab5bf6ebb37477e94958ca81a3d Mon Sep 17 00:00:00 2001 From: Aaron Gable Date: Mon, 19 Dec 2022 10:41:48 -0800 Subject: [PATCH] Update Public Suffix List (#6556) 11 additions and 9 removals. --- go.mod | 2 +- go.sum | 6 ++---- .../publicsuffix-go/publicsuffix/rules.go | 20 ++++++++++--------- vendor/modules.txt | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 30da648e8..269b7b315 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/prometheus/client_golang v1.13.0 github.com/prometheus/client_model v0.3.0 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 - github.com/weppos/publicsuffix-go v0.20.1-0.20221031080346-e4081aa8a6de + github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 github.com/zmap/zcrypto v0.0.0-20220402174210-599ec18ecbac github.com/zmap/zlint/v3 v3.4.0 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d diff --git a/go.sum b/go.sum index 18f1406bf..fd7873021 100644 --- a/go.sum +++ b/go.sum @@ -477,8 +477,8 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/weppos/publicsuffix-go v0.12.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/weppos/publicsuffix-go v0.15.1-0.20220329081811-9a40b608a236/go.mod h1:HYux0V0Zi04bHNwOHy4cXJVz/TQjYonnF6aoYhj+3QE= -github.com/weppos/publicsuffix-go v0.20.1-0.20221031080346-e4081aa8a6de h1:eR9jm8DVMdrDUuVji4eOxPK4r/dANDlDBdISSUUV96s= -github.com/weppos/publicsuffix-go v0.20.1-0.20221031080346-e4081aa8a6de/go.mod h1:g9GsAxnaxsUuTLZcQdYbi43vT2k9ubZGHsdCy819VLk= +github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 h1:ypyhoprZWFzU0ydOBv3I5SS7/jLFJ+ujPAU+BD/EVFM= +github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3/go.mod h1:g9GsAxnaxsUuTLZcQdYbi43vT2k9ubZGHsdCy819VLk= github.com/weppos/publicsuffix-go/publicsuffix/generator v0.0.0-20220927085643-dc0d00c92642/go.mod h1:GHfoeIdZLdZmLjMlzBftbTDntahTttUMWjxZwQJhULE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -622,8 +622,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go index e3e2f2961..b433755a3 100644 --- a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go +++ b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go @@ -3,13 +3,13 @@ package publicsuffix -const defaultListVersion = "PSL version ef8ba6 (Sun Oct 30 18:35:07 2022)" +const defaultListVersion = "PSL version 4aec13 (Thu Dec 8 19:42:12 2022)" -func DefaultRules() [9464]Rule { +func DefaultRules() [9466]Rule { return r } -var r = [9464]Rule{ +var r = [9466]Rule{ {1, "ac", 1, false}, {1, "com.ac", 2, false}, {1, "edu.ac", 2, false}, @@ -6240,7 +6240,6 @@ var r = [9464]Rule{ {1, "accountants", 1, false}, {1, "aco", 1, false}, {1, "actor", 1, false}, - {1, "adac", 1, false}, {1, "ads", 1, false}, {1, "adult", 1, false}, {1, "aeg", 1, false}, @@ -7321,7 +7320,6 @@ var r = [9464]Rule{ {1, "xn--io0a7i", 1, false}, {1, "xn--j1aef", 1, false}, {1, "xn--jlq480n2rg", 1, false}, - {1, "xn--jlq61u9w7b", 1, false}, {1, "xn--jvr189m", 1, false}, {1, "xn--kcrx77d1x4a", 1, false}, {1, "xn--kput3i", 1, false}, @@ -7384,6 +7382,7 @@ var r = [9464]Rule{ {1, "graphox.us", 2, true}, {2, "devcdnaccesso.com", 3, true}, {2, "on-acorn.io", 3, true}, + {1, "activetrail.biz", 2, true}, {1, "adobeaemcloud.com", 2, true}, {2, "dev.adobeaemcloud.com", 4, true}, {1, "hlx.live", 2, true}, @@ -7401,6 +7400,7 @@ var r = [9464]Rule{ {1, "kasserver.com", 2, true}, {1, "altervista.org", 2, true}, {1, "alwaysdata.net", 2, true}, + {1, "myamaze.net", 2, true}, {1, "cloudfront.net", 2, true}, {2, "compute.amazonaws.com", 4, true}, {2, "compute-1.amazonaws.com", 4, true}, @@ -7657,8 +7657,11 @@ var r = [9464]Rule{ {1, "cloudcontrolled.com", 2, true}, {1, "cloudcontrolapp.com", 2, true}, {2, "cloudera.site", 3, true}, - {1, "pages.dev", 2, true}, + {1, "cf-ipfs.com", 2, true}, + {1, "cloudflare-ipfs.com", 2, true}, {1, "trycloudflare.com", 2, true}, + {1, "pages.dev", 2, true}, + {1, "r2.dev", 2, true}, {1, "workers.dev", 2, true}, {1, "wnext.app", 2, true}, {1, "co.ca", 2, true}, @@ -8554,7 +8557,6 @@ var r = [9464]Rule{ {1, "herokuapp.com", 2, true}, {1, "herokussl.com", 2, true}, {1, "ravendb.cloud", 2, true}, - {1, "myravendb.com", 2, true}, {1, "ravendb.community", 2, true}, {1, "ravendb.me", 2, true}, {1, "development.run", 2, true}, @@ -9277,6 +9279,8 @@ var r = [9464]Rule{ {1, "vpnplus.to", 2, true}, {1, "direct.quickconnect.to", 3, true}, {1, "tabitorder.co.il", 3, true}, + {1, "mytabit.co.il", 3, true}, + {1, "mytabit.com", 2, true}, {1, "taifun-dns.de", 2, true}, {1, "beta.tailscale.net", 3, true}, {1, "ts.net", 2, true}, @@ -9291,7 +9295,6 @@ var r = [9464]Rule{ {1, "telebit.app", 2, true}, {1, "telebit.io", 2, true}, {2, "telebit.xyz", 3, true}, - {1, "gwiddle.co.uk", 3, true}, {2, "firenet.ch", 3, true}, {2, "svc.firenet.ch", 4, true}, {1, "reservd.com", 2, true}, @@ -9311,7 +9314,6 @@ var r = [9464]Rule{ {1, "pages.torproject.net", 3, true}, {1, "bloxcms.com", 2, true}, {1, "townnews-staging.com", 2, true}, - {1, "tbits.me", 2, true}, {1, "12hp.at", 2, true}, {1, "2ix.at", 2, true}, {1, "4lima.at", 2, true}, diff --git a/vendor/modules.txt b/vendor/modules.txt index 1ab7a101f..ca3f75224 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -269,7 +269,7 @@ github.com/vmihailenco/msgpack/v5/msgpcode github.com/vmihailenco/tagparser/v2 github.com/vmihailenco/tagparser/v2/internal github.com/vmihailenco/tagparser/v2/internal/parser -# github.com/weppos/publicsuffix-go v0.20.1-0.20221031080346-e4081aa8a6de +# github.com/weppos/publicsuffix-go v0.20.1-0.20221209102050-40d9c30084b3 ## explicit; go 1.13 github.com/weppos/publicsuffix-go/publicsuffix # github.com/zmap/zcrypto v0.0.0-20220402174210-599ec18ecbac