8244087: 2020-04-24 public suffix list update
Reviewed-by: mullan
diff --git a/make/data/publicsuffixlist/VERSION b/make/data/publicsuffixlist/VERSION
index 0f982e7..3367b24 100644
--- a/make/data/publicsuffixlist/VERSION
+++ b/make/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
-Date: 2019-09-28
+Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
+Date: 2020-04-24
diff --git a/make/data/publicsuffixlist/public_suffix_list.dat b/make/data/publicsuffixlist/public_suffix_list.dat
index 88f2f8f..27fe1ee 100644
--- a/make/data/publicsuffixlist/public_suffix_list.dat
+++ b/make/data/publicsuffixlist/public_suffix_list.dat
@@ -79,7 +79,6 @@
express.aero
federation.aero
flight.aero
-freight.aero
fuel.aero
gliding.aero
government.aero
@@ -213,6 +212,7 @@
co.at
gv.at
or.at
+sth.ac.at
// au : https://en.wikipedia.org/wiki/.au
// http://www.auda.org.au/
@@ -241,7 +241,7 @@
// 3LDs
act.edu.au
catholic.edu.au
-eq.edu.au
+// eq.edu.au - Removed at the request of the Queensland Department of Education
nsw.edu.au
nt.edu.au
qld.edu.au
@@ -719,11 +719,13 @@
*.ck
!www.ck
-// cl : https://en.wikipedia.org/wiki/.cl
+// cl : https://www.nic.cl
+// Confirmed by .CL registry <hsalgado@nic.cl>
cl
-gov.cl
-gob.cl
+aprendemas.cl
co.cl
+gob.cl
+gov.cl
mil.cl
// cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
@@ -982,8 +984,19 @@
// TODO: Check for updates (expected to be phased out around Q1/2009)
aland.fi
-// fj : https://en.wikipedia.org/wiki/.fj
-*.fj
+// fj : http://domains.fj/
+// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
+fj
+ac.fj
+biz.fj
+com.fj
+gov.fj
+info.fj
+mil.fj
+name.fj
+net.fj
+org.fj
+pro.fj
// fk : https://en.wikipedia.org/wiki/.fk
*.fk
@@ -1368,7 +1381,7 @@
gov.it
edu.it
// Reserved geo-names (regions and provinces):
-// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf
+// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
// Regions
abr.it
abruzzo.it
@@ -5886,14 +5899,9 @@
in.rs
org.rs
-// ru : https://cctld.ru/en/domains/domens_ru/reserved/
+// ru : https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
+// Submitted by George Georgievsky <gug@cctld.ru>
ru
-ac.ru
-edu.ru
-gov.ru
-int.ru
-mil.ru
-test.ru
// rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
rw
@@ -6038,9 +6046,12 @@
perso.sn
univ.sn
-// so : http://www.soregistry.com/
+// so : http://sonic.so/policies/
so
com.so
+edu.so
+gov.so
+me.so
net.so
org.so
@@ -6510,7 +6521,7 @@
k12.or.us
k12.pa.us
k12.pr.us
-k12.ri.us
+// k12.ri.us Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
k12.sc.us
// k12.sd.us Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
k12.tn.us
@@ -6797,8 +6808,13 @@
مصر
// xn--e1a4c ("eu", Cyrillic) : EU
+// https://eurid.eu
ею
+// xn--qxa6a ("eu", Greek) : EU
+// https://eurid.eu
+ευ
+
// xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR
موريتانيا
@@ -6955,7 +6971,8 @@
ак.срб
// xn--p1ai ("rf", Russian-Cyrillic) : RU
-// http://www.cctld.ru/en/docs/rulesrf.php
+// https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
+// Submitted by George Georgievsky <gug@cctld.ru>
рф
// xn--wgbl6a ("Qatar", Arabic) : QA
@@ -7075,7 +7092,7 @@
// newGTLDs
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-09-26T16:43:02Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
@@ -7197,6 +7214,9 @@
// alstom : 2015-07-30 ALSTOM
alstom
+// amazon : 2019-12-19 Amazon Registry Services, Inc.
+amazon
+
// americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
americanexpress
@@ -7296,7 +7316,7 @@
// autos : 2014-01-09 DERAutos, LLC
autos
-// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
+// avianca : 2015-01-08 Avianca Holdings S.A.
avianca
// aws : 2015-06-25 Amazon Registry Services, Inc.
@@ -7374,7 +7394,7 @@
// beats : 2015-05-14 Beats Electronics, LLC
beats
-// beauty : 2015-12-03 L'Oréal
+// beauty : 2015-12-03 XYZ.COM LLC
beauty
// beer : 2014-01-09 Minds + Machines Group Limited
@@ -7587,9 +7607,6 @@
// cars : 2014-11-13 Cars Registry Limited
cars
-// cartier : 2014-06-23 Richemont DNS Inc.
-cartier
-
// casa : 2013-11-21 Minds + Machines Group Limited
casa
@@ -7668,9 +7685,6 @@
// chrome : 2014-07-24 Charleston Road Registry Inc.
chrome
-// chrysler : 2015-07-30 FCA US LLC.
-chrysler
-
// church : 2014-02-06 Binky Moon, LLC
church
@@ -7836,7 +7850,7 @@
// cymru : 2014-05-08 Nominet UK
cymru
-// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
+// cyou : 2015-01-22 ShortDot SA
cyou
// dabur : 2014-02-06 Dabur India Limited
@@ -7950,9 +7964,6 @@
// doctor : 2016-06-02 Binky Moon, LLC
doctor
-// dodge : 2015-07-30 FCA US LLC.
-dodge
-
// dog : 2014-12-04 Binky Moon, LLC
dog
@@ -8058,9 +8069,6 @@
// events : 2013-12-05 Binky Moon, LLC
events
-// everbank : 2014-05-15 EverBank
-everbank
-
// exchange : 2014-03-06 Binky Moon, LLC
exchange
@@ -8334,7 +8342,7 @@
// gmbh : 2016-01-29 Binky Moon, LLC
gmbh
-// gmo : 2014-01-09 GMO Internet Pte. Ltd.
+// gmo : 2014-01-09 GMO Internet, Inc.
gmo
// gmx : 2014-04-24 1&1 Mail & Media GmbH
@@ -8409,7 +8417,7 @@
// guru : 2013-08-27 Binky Moon, LLC
guru
-// hair : 2015-12-03 L'Oréal
+// hair : 2015-12-03 XYZ.COM LLC
hair
// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
@@ -8745,9 +8753,6 @@
// lacaixa : 2014-01-09 Fundación Bancaria Caixa d’Estalvis i Pensions de Barcelona, “la Caixa”
lacaixa
-// ladbrokes : 2015-08-06 LADBROKES INTERNATIONAL PLC
-ladbrokes
-
// lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
lamborghini
@@ -8760,9 +8765,6 @@
// lancia : 2015-07-31 Fiat Chrysler Automobiles N.V.
lancia
-// lancome : 2015-07-23 L'Oréal
-lancome
-
// land : 2013-09-10 Binky Moon, LLC
land
@@ -8814,9 +8816,6 @@
// lgbt : 2014-05-08 Afilias Limited
lgbt
-// liaison : 2014-10-02 Liaison Technologies, Incorporated
-liaison
-
// lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
lidl
@@ -8937,7 +8936,7 @@
// maison : 2013-12-05 Binky Moon, LLC
maison
-// makeup : 2015-01-15 L'Oréal
+// makeup : 2015-01-15 XYZ.COM LLC
makeup
// man : 2014-12-04 MAN SE
@@ -9060,9 +9059,6 @@
// monster : 2015-09-11 XYZ.COM LLC
monster
-// mopar : 2015-07-30 FCA US LLC.
-mopar
-
// mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant")
mormon
@@ -9084,9 +9080,6 @@
// movie : 2015-02-05 Binky Moon, LLC
movie
-// movistar : 2014-10-16 Telefónica S.A.
-movistar
-
// msd : 2015-07-23 MSD Registry Holdings, Inc.
msd
@@ -9102,9 +9095,6 @@
// nab : 2015-08-20 National Australia Bank Limited
nab
-// nadex : 2014-12-11 Nadex Domains, Inc.
-nadex
-
// nagoya : 2013-10-24 GMO Registry, Inc.
nagoya
@@ -9345,9 +9335,6 @@
// physio : 2014-05-01 PhysBiz Pty Ltd
physio
-// piaget : 2014-10-16 Richemont DNS Inc.
-piaget
-
// pics : 2013-11-14 Uniregistry, Corp.
pics
@@ -9459,7 +9446,7 @@
// quebec : 2013-12-19 PointQuébec Inc
quebec
-// quest : 2015-03-26 Quest ION Limited
+// quest : 2015-03-26 XYZ.COM LLC
quest
// qvc : 2015-07-30 QVC, Inc.
@@ -9789,7 +9776,7 @@
// ski : 2015-04-09 Afilias Limited
ski
-// skin : 2015-01-15 L'Oréal
+// skin : 2015-01-15 XYZ.COM LLC
skin
// sky : 2014-06-19 Sky International AG
@@ -9858,9 +9845,6 @@
// srl : 2015-05-07 InterNetX, Corp
srl
-// srt : 2015-07-30 FCA US LLC.
-srt
-
// stada : 2014-11-13 STADA Arzneimittel AG
stada
@@ -9987,9 +9971,6 @@
// technology : 2013-09-13 Binky Moon, LLC
technology
-// telefonica : 2014-10-16 Telefónica S.A.
-telefonica
-
// temasek : 2014-08-07 Temasek Holdings (Private) Limited
temasek
@@ -10083,7 +10064,7 @@
// training : 2013-11-07 Binky Moon, LLC
training
-// travel : Dog Beach, LLC
+// travel : 2015-10-09 Dog Beach, LLC
travel
// travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
@@ -10122,9 +10103,6 @@
// ubs : 2014-12-11 UBS AG
ubs
-// uconnect : 2015-07-30 FCA US LLC.
-uconnect
-
// unicom : 2015-10-15 China United Network Communications Corporation Limited
unicom
@@ -10194,9 +10172,6 @@
// vision : 2013-12-05 Binky Moon, LLC
vision
-// vistaprint : 2014-09-18 Vistaprint Limited
-vistaprint
-
// viva : 2014-11-07 Saudi Telecom Company
viva
@@ -10245,9 +10220,6 @@
// wanggou : 2014-12-18 Amazon Registry Services, Inc.
wanggou
-// warman : 2015-06-18 Weir Group IP Limited
-warman
-
// watch : 2013-11-14 Binky Moon, LLC
watch
@@ -10362,7 +10334,7 @@
// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
集团
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED
+// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
在线
// xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd.
@@ -10377,7 +10349,7 @@
// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
八卦
-// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment
+// xn--4gbrim : 2013-10-04 Fans TLD Limited
موقع
// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
@@ -10437,10 +10409,13 @@
// xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
ストア
+// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc.
+アマゾン
+
// xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
삼성
-// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited
+// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited
商标
// xn--czrs0t : 2013-12-19 Binky Moon, LLC
@@ -10458,16 +10433,13 @@
// xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd.
新闻
-// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited
-工行
-
// xn--fct429k : 2015-04-09 Amazon Registry Services, Inc.
家電
// xn--fhbei : 2015-01-15 VeriSign Sarl
كوم
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED
+// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY
中文网
// xn--fiq64b : 2013-10-14 CITIC Group Corporation
@@ -10497,7 +10469,7 @@
// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
संगठन
-// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited
+// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited
餐厅
// xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC)
@@ -10506,6 +10478,9 @@
// xn--j1aef : 2015-01-15 VeriSign Sarl
ком
+// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc.
+亚马逊
+
// xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
诺基亚
@@ -10566,7 +10541,7 @@
// xn--nyqy26a : 2014-11-07 Stable Tone Limited
健康
-// xn--otu796d : 2017-08-06 Dot Trademark TLD Holding Company Limited
+// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
招聘
// xn--p1acf : 2013-12-12 Rusnames Limited
@@ -10641,7 +10616,7 @@
// yamaxun : 2014-12-18 Amazon Registry Services, Inc.
yamaxun
-// yandex : 2014-04-10 YANDEX, LLC
+// yandex : 2014-04-10 Yandex Europe B.V.
yandex
// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
@@ -10691,6 +10666,12 @@
inf.ua
ltd.ua
+// Adobe : https://www.adobe.com/
+// Submitted by Ian Boston <boston@adobe.com>
+adobeaemcloud.com
+adobeaemcloud.net
+*.dev.adobeaemcloud.com
+
// Agnat sp. z o.o. : https://domena.pl
// Submitted by Przemyslaw Plewa <it-admin@domena.pl>
beep.pl
@@ -10808,6 +10789,10 @@
s3-website.eu-west-3.amazonaws.com
s3-website.us-east-2.amazonaws.com
+// Amsterdam Wireless: https://www.amsterdamwireless.nl/
+// Submitted by Imre Jonk <hostmaster@amsterdamwireless.nl>
+amsw.nl
+
// Amune : https://amune.org/
// Submitted by Team Amune <cert@amune.org>
t3l3p0rt.net
@@ -10842,12 +10827,6 @@
// Submitted by Vincent Tseng <vincenttseng@asustor.com>
myasustor.com
-// Automattic Inc. : https://automattic.com/
-// Submitted by Alex Concha <alex.concha@automattic.com>
-go-vip.co
-go-vip.net
-wpcomstaging.com
-
// AVM : https://avm.de
// Submitted by Andreas Weise <a.weise@avm.de>
myfritz.net
@@ -10984,8 +10963,9 @@
xenapponazure.com
// Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar <rishabh.nambiar@discourse.org>
+// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
discourse.group
+discourse.team
// ClearVox : http://www.clearvox.nl/
// Submitted by Leon Rowland <leon@clearvox.nl>
@@ -11000,6 +10980,10 @@
*.lcl.dev
*.stg.dev
+// Clic2000 : https://clic2000.fr
+// Submitted by Mathilde Blanchemanche <mathilde@clic2000.fr>
+clic2000.net
+
// Cloud66 : https://www.cloud66.com/
// Submitted by Khash Sajadi <khash@cloud66.com>
c66.me
@@ -11082,6 +11066,15 @@
webhosting.be
hosting-cluster.nl
+// Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
+// Submitted by George Georgievsky <gug@cctld.ru>
+ac.ru
+edu.ru
+gov.ru
+int.ru
+mil.ru
+test.ru
+
// COSIMO GmbH : http://www.cosimo.de
// Submitted by Rene Marticke <rmarticke@cosimo.de>
dyn.cosidns.de
@@ -11106,6 +11099,18 @@
// Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
cupcake.is
+// Curv UG : https://curv-labs.de/
+// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
+curv.dev
+
+// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
+// Submitted by Gregory Drake <support@dyn.com>
+// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
+*.customer-oci.com
+*.oci.customer-oci.com
+*.ocp.customer-oci.com
+*.ocs.customer-oci.com
+
// cyon GmbH : https://www.cyon.ch/
// Submitted by Dominic Luechinger <dol@cyon.ch>
cyon.link
@@ -11133,11 +11138,23 @@
reg.dk
store.dk
+// dappnode.io : https://dappnode.io/
+// Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
+dyndns.dappnode.io
+
// dapps.earth : https://dapps.earth/
// Submitted by Daniil Burdakov <icqkill@gmail.com>
*.dapps.earth
*.bzz.dapps.earth
+// Dark, Inc. : https://darklang.com
+// Submitted by Paul Biggar <ops@darklang.com>
+builtwithdark.com
+
+// Datawire, Inc : https://www.datawire.io
+// Submitted by Richard Li <secalert@datawire.io>
+edgestack.me
+
// Debian : https://www.debian.org/
// Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
debian.net
@@ -11511,6 +11528,10 @@
// Submitted by Vladimir Dudr <info@e4you.cz>
e4.cz
+// En root‽ : https://en-root.org
+// Submitted by Emmanuel Raviart <emmanuel@raviart.com>
+en-root.fr
+
// Enalean SAS: https://www.enalean.com
// Submitted by Thomas Cottier <thomas.cottier@enalean.com>
mytuleap.com
@@ -11603,6 +11624,10 @@
mymailer.com.tw
url.tw
+// Fabrica Technologies, Inc. : https://www.fabrica.dev/
+// Submitted by Eric Jiang <eric@fabrica.dev>
+onfabrica.com
+
// Facebook, Inc.
// Submitted by Peter Ruibal <public-suffix@fb.com>
apps.fbsbx.com
@@ -11686,6 +11711,7 @@
// Fancy Bits, LLC : http://getchannels.com
// Submitted by Aman Gupta <aman@getchannels.com>
channelsdvr.net
+u.channelsdvr.net
// Fastly Inc. : http://www.fastly.com/
// Submitted by Fastly Security <security@fastly.com>
@@ -11704,6 +11730,10 @@
// Submitted by Likhachev Vasiliy <lihachev@fastvps.ru>
fastpanel.direct
fastvps-server.com
+myfast.space
+myfast.host
+fastvps.site
+fastvps.host
// Featherhead : https://featherhead.xyz/
// Submitted by Simon Menke <simon@featherhead.xyz>
@@ -11717,6 +11747,13 @@
app.os.fedoraproject.org
app.os.stg.fedoraproject.org
+// FearWorks Media Ltd. : https://fearworksmedia.co.uk
+// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
+conn.uk
+copro.uk
+couk.me
+ukco.me
+
// Fermax : https://fermax.com/
// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
mydobiss.com
@@ -11737,9 +11774,12 @@
// Flynn : https://flynn.io
// Submitted by Jonathan Rudenberg <jonathan@flynn.io>
-flynnhub.com
flynnhosting.net
+// Frederik Braun https://frederik-braun.com
+// Submitted by Frederik Braun <fb@frederik-braun.com>
+0e.vc
+
// Freebox : http://www.freebox.fr
// Submitted by Romain Fliedel <rfliedel@freebox.fr>
freebox-os.com
@@ -11773,8 +11813,9 @@
gehirn.ne.jp
usercontent.jp
-// Gentlent, Limited : https://www.gentlent.com
-// Submitted by Tom Klein <tklein@gentlent.com>
+// Gentlent, Inc. : https://www.gentlent.com
+// Submitted by Tom Klein <tom@gentlent.com>
+gentapps.com
lab.ms
// GitHub, Inc.
@@ -11819,6 +11860,7 @@
web.app
*.0emm.com
appspot.com
+*.r.appspot.com
blogspot.ae
blogspot.al
blogspot.am
@@ -11903,6 +11945,14 @@
withgoogle.com
withyoutube.com
+// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
+// Submitted by Aaron Marais <its_me@aaronleem.co.za>
+graphox.us
+
+// Group 53, LLC : https://www.group53.com
+// Submitted by Tyler Todd <noc@nova53.net>
+awsmppl.com
+
// Hakaran group: http://hakaran.cz
// Submited by Arseniy Sokolov <security@hakaran.cz>
fin.ci
@@ -11952,6 +12002,7 @@
firm.ng
gen.ng
ltd.ng
+ngo.ng
ng.school
sch.so
@@ -12028,8 +12079,9 @@
ipifony.net
// IServ GmbH : https://iserv.eu
-// Submitted by Kim-Alexander Brodowski <kim.brodowski@iserv.eu>
+// Submitted by Kim-Alexander Brodowski <info@iserv.eu>
mein-iserv.de
+schulserver.de
test-iserv.de
iserv.dev
@@ -12072,6 +12124,10 @@
// Submitted by Roy Keene <rkeene@knightpoint.com>
knightpoint.systems
+// KUROKU LTD : https://kuroku.ltd/
+// Submitted by DisposaBoy <security@oya.to>
+oya.to
+
// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
co.krd
edu.krd
@@ -12211,8 +12267,8 @@
co.pl
// Microsoft Corporation : http://microsoft.com
-// Submitted by Justin Luk <juluk@microsoft.com>
-azurecontainer.io
+// Submitted by Mostafa Elzeiny <moelzein@microsoft.com>
+*.azurecontainer.io
azurewebsites.net
azure-mobile.net
cloudapp.net
@@ -12258,6 +12314,7 @@
// Netlify : https://www.netlify.com
// Submitted by Jessica Parsons <jessica@netlify.com>
bitballoon.com
+netlify.app
netlify.com
// Neustar Inc.
@@ -12415,12 +12472,13 @@
nyc.mn
// NymNom : https://nymnom.com/
-// Submitted by Dave McCormack <dave.mccormack@nymnom.com>
+// Submitted by NymNom <psl@nymnom.com>
nom.ae
nom.af
nom.ai
nom.al
nym.by
+nom.bz
nym.bz
nom.cl
nym.ec
@@ -12442,6 +12500,7 @@
nym.li
nym.lt
nym.lu
+nom.lv
nym.me
nom.mk
nym.mn
@@ -12466,6 +12525,10 @@
nom.vc
nom.vg
+// Observable, Inc. : https://observablehq.com
+// Submitted by Mike Bostock <dns@observablehq.com>
+static.observableusercontent.com
+
// Octopodal Solutions, LLC. : https://ulterius.io/
// Submitted by Andrew Sampson <andrew@ulterius.io>
cya.gg
@@ -12486,6 +12549,10 @@
// Submitted by Yngve Pettersen <yngve@opera.com>
operaunite.com
+// Oursky Limited : https://skygear.io/
+// Submited by Skygear Developer <hello@skygear.io>
+skygearapp.com
+
// OutSystems
// Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
outsystemscloud.com
@@ -12528,6 +12595,10 @@
// Submitted by Steve Leung <steveleung@peplink.com>
mypep.link
+// Perspecta : https://perspecta.com/
+// Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
+perspecta.cloud
+
// Planet-Work : https://www.planet-work.com/
// Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
on-web.fr
@@ -12537,6 +12608,12 @@
*.platform.sh
*.platformsh.site
+// Platter: https://platter.dev
+// Submitted by Patrick Flor <patrick@platter.dev>
+platter-app.com
+platter-app.dev
+platterp.us
+
// Port53 : https://port53.io/
// Submitted by Maximilian Schieder <maxi@zeug.co>
dyn53.io
@@ -12578,6 +12655,10 @@
// Submitted by Xavier De Cock <xdecock@gmail.com>
qualifioapp.com
+// QuickBackend: https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
// Redstar Consultants : https://www.redstarconsultants.com/
// Submitted by Jons Slemmer <jons@redstarconsultants.com>
instantcloud.cn
@@ -12590,6 +12671,11 @@
// Submitted by Daniel Dent (https://www.danieldent.com/)
qa2.com
+// QCX
+// Submitted by Cassandra Beelen <cassandra@beelen.one>
+qcx.io
+*.sys.qcx.io
+
// QNAP System Inc : https://www.qnap.com
// Submitted by Nick Chang <nickchang@qnap.com>
dev-myqnapcloud.com
@@ -12612,6 +12698,7 @@
// Rancher Labs, Inc : https://rancher.com
// Submitted by Vincent Fiduccia <domains@rancher.com>
+*.on-k3s.io
*.on-rancher.cloud
*.on-rio.io
@@ -12665,6 +12752,10 @@
// Submitted by Hanno Böck <hanno@schokokeks.org>
schokokeks.net
+// Scottish Government: https://www.gov.scot
+// Submitted by Martin Ellis <martin.ellis@gov.scot>
+gov.scot
+
// Scry Security : http://www.scrysec.com
// Submitted by Shante Adam <shante@skyhat.io>
scrysec.com
@@ -12682,6 +12773,10 @@
myfirewall.org
spdns.org
+// Senseering GmbH : https://www.senseering.de
+// Submitted by Felix Mönckemeyer <f.moenckemeyer@senseering.de>
+senseering.net
+
// Service Online LLC : http://drs.ua/
// Submitted by Serhii Bulakh <support@drs.ua>
biz.ua
@@ -12700,6 +12795,10 @@
// Submitted by Craig McMahon <craig@shopitcommerce.com>
shopitsite.com
+// shopware AG : https://shopware.com
+// Submitted by Jens Küper <cloud@shopware.com>
+shopware.store
+
// Siemens Mobility GmbH
// Submitted by Oliver Graebner <security@mo-siemens.io>
mo-siemens.io
@@ -12732,6 +12831,10 @@
dev.static.land
sites.static.land
+// Sony Interactive Entertainment LLC : https://sie.com/
+// Submitted by David Coles <david.coles@sony.com>
+playstation-cloud.com
+
// SourceLair PC : https://www.sourcelair.com
// Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
apps.lair.io
@@ -12906,6 +13009,11 @@
virtualuser.de
virtual-user.de
+// urown.net : https://urown.net
+// Submitted by Hostmaster <hostmaster@urown.net>
+urown.cloud
+dnsupdate.info
+
// .US
// Submitted by Ed Moore <Ed.Moore@lib.de.us>
lib.de.us
@@ -12926,6 +13034,10 @@
// Submitted by Nathan van Bakel <info@voorloper.com>
voorloper.cloud
+// V.UA Domain Administrator : https://domain.v.ua/
+// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
+v.ua
+
// Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com
// Submitted by Masayuki Note <masa@blade.wafflecell.com>
wafflecell.com
@@ -12945,8 +13057,23 @@
remotewd.com
// Wikimedia Labs : https://wikitech.wikimedia.org
-// Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
+// Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
wmflabs.org
+toolforge.org
+wmcloud.org
+
+// WISP : https://wisp.gg
+// Submitted by Stepan Fedotov <stepan@wisp.gg>
+panel.gg
+daemon.panel.gg
+
+// WoltLab GmbH : https://www.woltlab.com
+// Submitted by Tim Düsterhus <security@woltlab.cloud>
+myforum.community
+community-pro.de
+diskussionsbereich.de
+community-pro.net
+meinforum.net
// XenonCloud GbR: https://xenoncloud.net
// Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
@@ -13010,7 +13137,10 @@
// Submitted by Emil Stahl <esp@zitcom.dk>
basicserver.io
virtualserver.io
-site.builder.nu
enterprisecloud.nu
+// Mintere : https://mintere.com/
+// Submitted by Ben Aubin <security@mintere.com>
+mintere.site
+
// ===END PRIVATE DOMAINS===
diff --git a/src/java.base/share/legal/public_suffix.md b/src/java.base/share/legal/public_suffix.md
index ef3fb1f..3c015a4 100644
--- a/src/java.base/share/legal/public_suffix.md
+++ b/src/java.base/share/legal/public_suffix.md
@@ -11,7 +11,7 @@
The Source Code of this file is available under the
Mozilla Public License, v. 2.0 and is located at
-https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat.
+https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat.
If a copy of the MPL was not distributed with this file, you can obtain one
at https://mozilla.org/MPL/2.0/.
diff --git a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
index b5a84f1..7b9433b 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
+++ b/test/jdk/sun/security/util/RegisteredDomain/ParseNames.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8228969
+ * @bug 8228969 8244087
* @modules java.base/sun.security.util
* @summary unit test for RegisteredDomain
*/
diff --git a/test/jdk/sun/security/util/RegisteredDomain/tests.dat b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
index 4151bb7..da9fba0 100644
--- a/test/jdk/sun/security/util/RegisteredDomain/tests.dat
+++ b/test/jdk/sun/security/util/RegisteredDomain/tests.dat
@@ -71,6 +71,10 @@
site.ar.com ar.com site.ar.com
w.site.ar.com ar.com site.ar.com
+# fj (no longer *.fj)
+foo.gov.fj gov.fj foo.gov.fj
+foo.fj fj foo.fj
+
# ie
www.foo.ie ie foo.ie
www.foo.gov.ie gov.ie foo.gov.ie
