Skip to content

Commit

Permalink
#641: M1677046 M1690169 update tzdata, TLDs, pins, HSTS
Browse files Browse the repository at this point in the history
  • Loading branch information
@classilla
classilla committed Mar 19, 2021
1 parent fcfba09 commit c6fd339
Show file tree
Hide file tree
Showing 6 changed files with 3,300 additions and 1,199 deletions.
10 changes: 9 additions & 1 deletion docshell/base/nsDocShell.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5385,11 +5385,19 @@ nsDocShell::Stop(uint32_t aStopFlags)
}

if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
// Stop the document loading
// Stop the document loading and animations
if (mContentViewer) {
nsCOMPtr<nsIContentViewer> cv = mContentViewer;
cv->Stop();
}
} else if (nsIWebNavigation::STOP_NETWORK & aStopFlags) {
// Stop the document loading only
if (mContentViewer) {
nsCOMPtr<nsIDocument> doc = mContentViewer->GetDocument();
if (doc) {
doc->StopDocumentLoad();
}
}
}

if (nsIWebNavigation::STOP_NETWORK & aStopFlags) {
Expand Down
12 changes: 5 additions & 7 deletions intl/icu/source/data/misc/windowsZones.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ windowsZones:table(nofallback){
BF{"Africa/Ouagadougou"}
CI{"Africa/Abidjan"}
GH{"Africa/Accra"}
GL{"America/Danmarkshavn"}
GM{"Africa/Banjul"}
GN{"Africa/Conakry"}
GW{"Africa/Bissau"}
Expand Down Expand Up @@ -674,14 +675,14 @@ windowsZones:table(nofallback){
}
"US Mountain Standard Time"{
001{"America/Phoenix"}
CA{"America/Creston America/Dawson_Creek America/Fort_Nelson"}
MX{"America/Hermosillo"}
US{"America/Phoenix"}
ZZ{"Etc/GMT+7"}
}
"UTC"{
001{"Etc/GMT"}
GL{"America/Danmarkshavn"}
ZZ{"Etc/GMT Etc/UTC"}
001{"Etc/UTC"}
ZZ{"Etc/UTC Etc/GMT"}
}
"UTC+12"{
001{"Etc/GMT-12"}
Expand Down Expand Up @@ -812,10 +813,7 @@ windowsZones:table(nofallback){
}
"Yukon Standard Time"{
001{"America/Whitehorse"}
CA{
"America/Whitehorse America/Creston America/Dawson America/Dawson_Cre"
"ek America/Fort_Nelson"
}
CA{"America/Whitehorse America/Dawson"}
}
}
}
23 changes: 23 additions & 0 deletions media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#include "mozilla/Telemetry.h"
#include "mozilla/Preferences.h"
#include "mozilla/PublicSSL.h"
#include "nsNetUtil.h" // NS_CheckPortSafety
#include "nsXULAppAPI.h"
#include "nsContentUtils.h"
#include "nsDOMJSUtils.h"
Expand Down Expand Up @@ -547,6 +548,13 @@ PeerConnectionConfiguration::Init(const RTCConfiguration& aSrc)
return NS_OK;
}

// list of known acceptable ports for webrtc
int16_t gGoodWebrtcPortList[] = {
3478, // stun or turn
5349, // stuns or turns
0, // Sentinel value: This MUST be zero
};

nsresult
PeerConnectionConfiguration::AddIceServer(const RTCIceServer &aServer)
{
Expand Down Expand Up @@ -620,6 +628,21 @@ PeerConnectionConfiguration::AddIceServer(const RTCIceServer &aServer)
if (port == -1)
port = (isStuns || isTurns)? 5349 : 3478;

// First check the known good ports for webrtc
bool goodPort = false;
for (int i = 0; !goodPort && gGoodWebrtcPortList[i]; i++) {
if (port == gGoodWebrtcPortList[i]) {
goodPort = true;
}
}

// if not in the list of known good ports for webrtc, check
// the generic block list using NS_CheckPortSafety.
if (!goodPort) {
rv = NS_CheckPortSafety(port, nullptr);
NS_ENSURE_SUCCESS(rv, rv);
}

if (isTurn || isTurns) {
NS_ConvertUTF16toUTF8 credential(aServer.mCredential);
NS_ConvertUTF16toUTF8 username(aServer.mUsername);
Expand Down
49 changes: 33 additions & 16 deletions netwerk/dns/effective_tld_names.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4594,15 +4594,17 @@ gob.mx
edu.mx
net.mx

// my : http://www.mynic.net.my/
// my : http://www.mynic.my/
// Available strings: https://mynic.my/resources/domains/buying-a-domain/
my
biz.my
com.my
net.my
org.my
gov.my
edu.my
gov.my
mil.my
name.my
net.my
org.my

// mz : http://www.uem.mz/
// Submitted by registry <[email protected]>
Expand Down Expand Up @@ -7123,7 +7125,7 @@ org.zw

// newGTLDs

// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-02-07T16:47:40Z
// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-03-04T15:37:38Z
// This list is auto-generated, don't edit it manually.
// aaa : 2015-02-26 American Automobile Association, Inc.
aaa
Expand Down Expand Up @@ -7641,9 +7643,6 @@ casa
// case : 2015-09-03 CNH Industrial N.V.
case

// caseih : 2015-09-03 CNH Industrial N.V.
caseih

// cash : 2014-03-06 Binky Moon, LLC
cash

Expand Down Expand Up @@ -9138,9 +9137,6 @@ neustar
// new : 2014-01-30 Charleston Road Registry Inc.
new

// newholland : 2015-09-03 CNH Industrial N.V.
newholland

// news : 2014-12-18 Dog Beach, LLC
news

Expand Down Expand Up @@ -10221,7 +10217,7 @@ wanggou
// watch : 2013-11-14 Binky Moon, LLC
watch

// watches : 2014-12-22 Richemont DNS Inc.
// watches : 2014-12-22 Afilias Limited
watches

// weather : 2015-01-08 International Business Machines Corporation
Expand Down Expand Up @@ -11003,9 +10999,11 @@ virtueeldomein.nl
cleverapps.io

// Clerk : https://www.clerk.dev
// Submitted by Colin Sidoti <colin@clerk.dev>
// Submitted by Colin Sidoti <systems@clerk.dev>
*.lcl.dev
*.lclstage.dev
*.stg.dev
*.stgstage.dev

// Clic2000 : https://clic2000.fr
// Submitted by Mathilde Blanchemanche <[email protected]>
Expand Down Expand Up @@ -11781,6 +11779,7 @@ u.channelsdvr.net

// Fastly Inc. : http://www.fastly.com/
// Submitted by Fastly Security <[email protected]>
edgecompute.app
fastly-terrarium.com
fastlylb.net
map.fastlylb.net
Expand Down Expand Up @@ -11855,6 +11854,11 @@ shw.io
// Submitted by Jonathan Rudenberg <[email protected]>
flynnhosting.net

// Framer : https://www.framer.com
// Submitted by Koen Rouwhorst <[email protected]>
framer.app
framercanvas.com

// Frederik Braun https://frederik-braun.com
// Submitted by Frederik Braun <[email protected]>
0e.vc
Expand Down Expand Up @@ -11934,7 +11938,7 @@ glitch.me
lolipop.io

// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
// Submitted by Tom Whitwell <tom.whitwell@digital.cabinet-office.gov.uk>
// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
cloudapps.digital
london.cloudapps.digital

Expand Down Expand Up @@ -12614,8 +12618,12 @@ nfshost.com

// Northflank Ltd. : https://northflank.com/
// Submitted by Marco Suter <[email protected]>
northflank.app
code.run
*.northflank.app
*.code.run

// Noticeable : https://noticeable.io
// Submitted by Laurent Pellegrino <[email protected]>
noticeable.news

// Now-DNS : https://now-dns.com
// Submitted by Steve Russell <[email protected]>
Expand Down Expand Up @@ -12998,6 +13006,10 @@ qualifioapp.com
// Submitted by Dani Biro <[email protected]>
qbuser.com

// Rad Web Hosting: https://radwebhosting.com
// Submitted by Scott Claeys <[email protected]>
cloudsite.builders

// Redstar Consultants : https://www.redstarconsultants.com/
// Submitted by Jons Slemmer <[email protected]>
instantcloud.cn
Expand Down Expand Up @@ -13097,6 +13109,7 @@ schokokeks.net
// Scottish Government: https://www.gov.scot
// Submitted by Martin Ellis <[email protected]>
gov.scot
service.gov.scot

// Scry Security : http://www.scrysec.com
// Submitted by Shante Adam <[email protected]>
Expand Down Expand Up @@ -13179,6 +13192,10 @@ small-web.org
// Submitted by Ian Streeter <[email protected]>
try-snowplow.com

// SourceHut : https://sourcehut.org
// Submitted by Drew DeVault <[email protected]>
srht.site

// Stackhero : https://www.stackhero.io
// Submitted by Adrien Gillon <[email protected]>
stackhero-network.com
Expand Down
5 changes: 3 additions & 2 deletions security/manager/ssl/StaticHPKPins.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "it.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "kr.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "kz.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "lens.google.com", true, false, false, -1, &kPinset_google_root_pems },
{ "li.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
{ "login.corp.google.com", true, false, false, -1, &kPinset_google_root_pems },
{ "login.yahoo.com", true, true, false, -1, &kPinset_yahoo },
Expand Down Expand Up @@ -1160,8 +1161,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "zh.search.yahoo.com", false, true, false, -1, &kPinset_yahoo },
};

// Pinning Preload List Length = 492;
// Pinning Preload List Length = 493;

static const int32_t kUnknownId = -1;

static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1621867387124000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1623682168163000);
Loading

0 comments on commit c6fd339

Please sign in to comment.