From addaffffbf24edda8ee96100ee3dd5b107e1b400 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 14:50:33 -0500 Subject: [PATCH] build(deps): Bump github.com/weppos/publicsuffix-go from 0.20.1-0.20221209102050-40d9c30084b3 to 0.30.0 (#6708) Bumps [github.com/weppos/publicsuffix-go](https://github.com/weppos/publicsuffix-go) from 0.20.1-0.20221209102050-40d9c30084b3 to 0.30.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 12 ++-- .../publicsuffix/publicsuffix.go | 4 +- .../publicsuffix-go/publicsuffix/rules.go | 57 ++++++++++++++++--- vendor/modules.txt | 4 +- 5 files changed, 62 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index f923227ca..59a60002e 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/prometheus/client_golang v1.14.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.20221209102050-40d9c30084b3 + github.com/weppos/publicsuffix-go v0.30.0 github.com/zmap/zcrypto v0.0.0-20220402174210-599ec18ecbac github.com/zmap/zlint/v3 v3.4.0 golang.org/x/crypto v0.1.0 diff --git a/go.sum b/go.sum index 2caeabd35..c79d77cd9 100644 --- a/go.sum +++ b/go.sum @@ -470,14 +470,15 @@ 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.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 v0.30.0 h1:QHPZ2GRu/YE7cvejH9iyavPOkVCB4dNxp2ZvtT+vQLY= +github.com/weppos/publicsuffix-go v0.30.0/go.mod h1:kBi8zwYnR0zrbm8RcuN1o9Fzgpnnn+btVN8uWPMyXAY= 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= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod h1:5iU54tB79AMBcySS0R2XIyZBAVmeHranShAFELYx7is= @@ -596,7 +597,7 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220926192436-02166a98028e/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -617,6 +618,7 @@ 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/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= @@ -673,7 +675,8 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -744,6 +747,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/publicsuffix.go b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/publicsuffix.go index 45c253754..69422e9db 100644 --- a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/publicsuffix.go +++ b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/publicsuffix.go @@ -20,7 +20,7 @@ const ( // Version identifies the current library version. // This is a pro forma convention given that Go dependencies // tends to be fetched directly from the repo. - Version = "0.20.0" + Version = "0.30.0" // NormalType represents a normal rule such as "com" NormalType = 1 @@ -540,5 +540,5 @@ func (l cookiejarList) PublicSuffix(domain string) string { // PublicSuffix implements cookiejar.String. func (cookiejarList) String() string { - return defaultListVersion + return ListVersion } diff --git a/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go b/vendor/github.com/weppos/publicsuffix-go/publicsuffix/rules.go index b433755a3..99df464c7 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 4aec13 (Thu Dec 8 19:42:12 2022)" +const ListVersion = "PSL version 8ec4d3 (Thu Feb 16 18:32:38 2023)" -func DefaultRules() [9466]Rule { +func DefaultRules() [9507]Rule { return r } -var r = [9466]Rule{ +var r = [9507]Rule{ {1, "ac", 1, false}, {1, "com.ac", 2, false}, {1, "edu.ac", 2, false}, @@ -307,9 +307,26 @@ var r = [9466]Rule{ {1, "org.bi", 2, false}, {1, "biz", 1, false}, {1, "bj", 1, false}, - {1, "asso.bj", 2, false}, - {1, "barreau.bj", 2, false}, - {1, "gouv.bj", 2, false}, + {1, "africa.bj", 2, false}, + {1, "agro.bj", 2, false}, + {1, "architectes.bj", 2, false}, + {1, "assur.bj", 2, false}, + {1, "avocats.bj", 2, false}, + {1, "co.bj", 2, false}, + {1, "com.bj", 2, false}, + {1, "eco.bj", 2, false}, + {1, "econo.bj", 2, false}, + {1, "edu.bj", 2, false}, + {1, "info.bj", 2, false}, + {1, "loisirs.bj", 2, false}, + {1, "money.bj", 2, false}, + {1, "net.bj", 2, false}, + {1, "org.bj", 2, false}, + {1, "ote.bj", 2, false}, + {1, "resto.bj", 2, false}, + {1, "restaurant.bj", 2, false}, + {1, "tourism.bj", 2, false}, + {1, "univ.bj", 2, false}, {1, "bm", 1, false}, {1, "com.bm", 2, false}, {1, "edu.bm", 2, false}, @@ -6804,7 +6821,6 @@ var r = [9466]Rule{ {1, "loans", 1, false}, {1, "locker", 1, false}, {1, "locus", 1, false}, - {1, "loft", 1, false}, {1, "lol", 1, false}, {1, "london", 1, false}, {1, "lotte", 1, false}, @@ -7067,7 +7083,6 @@ var r = [9466]Rule{ {1, "select", 1, false}, {1, "sener", 1, false}, {1, "services", 1, false}, - {1, "ses", 1, false}, {1, "seven", 1, false}, {1, "sew", 1, false}, {1, "sex", 1, false}, @@ -7389,11 +7404,28 @@ var r = [9466]Rule{ {1, "adobeaemcloud.net", 2, true}, {1, "hlx.page", 2, true}, {1, "hlx3.page", 2, true}, + {1, "adobeio-static.net", 2, true}, + {1, "adobeioruntime.net", 2, true}, {1, "beep.pl", 2, true}, {1, "airkitapps.com", 2, true}, {1, "airkitapps-au.com", 2, true}, {1, "airkitapps.eu", 2, true}, {1, "aivencloud.com", 2, true}, + {1, "akadns.net", 2, true}, + {1, "akamai.net", 2, true}, + {1, "akamai-staging.net", 2, true}, + {1, "akamaiedge.net", 2, true}, + {1, "akamaiedge-staging.net", 2, true}, + {1, "akamaihd.net", 2, true}, + {1, "akamaihd-staging.net", 2, true}, + {1, "akamaiorigin.net", 2, true}, + {1, "akamaiorigin-staging.net", 2, true}, + {1, "akamaized.net", 2, true}, + {1, "akamaized-staging.net", 2, true}, + {1, "edgekey.net", 2, true}, + {1, "edgekey-staging.net", 2, true}, + {1, "edgesuite.net", 2, true}, + {1, "edgesuite-staging.net", 2, true}, {1, "barsy.ca", 2, true}, {2, "compute.estate", 3, true}, {2, "alces.network", 3, true}, @@ -7546,6 +7578,7 @@ var r = [9466]Rule{ {1, "myasustor.com", 2, true}, {1, "cdn.prod.atlassian-dev.net", 4, true}, {1, "translated.page", 2, true}, + {1, "autocode.dev", 2, true}, {1, "myfritz.net", 2, true}, {1, "onavstack.net", 2, true}, {2, "awdev.ca", 3, true}, @@ -7592,6 +7625,8 @@ var r = [9466]Rule{ {1, "vm.bytemark.co.uk", 4, true}, {1, "cafjs.com", 2, true}, {1, "mycd.eu", 2, true}, + {1, "canva-apps.cn", 2, true}, + {1, "canva-apps.com", 2, true}, {1, "drr.ac", 2, true}, {1, "uwu.ai", 2, true}, {1, "carrd.co", 2, true}, @@ -8234,6 +8269,7 @@ var r = [9466]Rule{ {1, "channelsdvr.net", 2, true}, {1, "u.channelsdvr.net", 3, true}, {1, "edgecompute.app", 2, true}, + {1, "fastly-edge.com", 2, true}, {1, "fastly-terrarium.com", 2, true}, {1, "fastlylb.net", 2, true}, {1, "map.fastlylb.net", 3, true}, @@ -8841,6 +8877,7 @@ var r = [9466]Rule{ {1, "azurestaticapps.net", 2, true}, {1, "1.azurestaticapps.net", 3, true}, {1, "2.azurestaticapps.net", 3, true}, + {1, "3.azurestaticapps.net", 3, true}, {1, "centralus.azurestaticapps.net", 3, true}, {1, "eastasia.azurestaticapps.net", 3, true}, {1, "eastus2.azurestaticapps.net", 3, true}, @@ -9211,6 +9248,9 @@ var r = [9466]Rule{ {1, "beta.bounty-full.com", 3, true}, {1, "small-web.org", 2, true}, {1, "vp4.me", 2, true}, + {1, "snowflake.app", 2, true}, + {1, "privatelink.snowflake.app", 3, true}, + {1, "streamlit.app", 2, true}, {1, "streamlitapp.com", 2, true}, {1, "try-snowplow.com", 2, true}, {1, "srht.site", 2, true}, @@ -9359,6 +9399,7 @@ var r = [9466]Rule{ {1, "hk.org", 2, true}, {1, "ltd.hk", 2, true}, {1, "inc.hk", 2, true}, + {1, "it.com", 2, true}, {1, "name.pm", 2, true}, {1, "sch.tf", 2, true}, {1, "biz.wf", 2, true}, diff --git a/vendor/modules.txt b/vendor/modules.txt index 696782dae..571d961f1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -279,8 +279,8 @@ 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.20221209102050-40d9c30084b3 -## explicit; go 1.13 +# github.com/weppos/publicsuffix-go v0.30.0 +## explicit; go 1.16 github.com/weppos/publicsuffix-go/publicsuffix # github.com/zmap/zcrypto v0.0.0-20220402174210-599ec18ecbac ## explicit; go 1.16