Bug 1388088 - Fix incorrect Cu.import() URL to unbreak HSTS periodic updates. r?keeler draft
authorCykesiopka <cykesiopka.bmo@gmail.com>
Tue, 08 Aug 2017 00:44:02 +0800
changeset 642065 3573e8695adb4843c24f68f4379dde0e59a71b47
parent 641632 47248637eafa9a38dade8dc3aa6c4736177c8d8d
child 724895 51b01bfd52e344209bcf81c6a6a50e637909fad4
push id72637
push usercykesiopka.bmo@gmail.com
push dateMon, 07 Aug 2017 16:44:35 +0000
reviewerskeeler
bugs1388088, 1383215
milestone57.0a1
Bug 1388088 - Fix incorrect Cu.import() URL to unbreak HSTS periodic updates. r?keeler The preload script currently imports XPCOMUtils.jsm like so: > Cu.import("resource:///modules/XPCOMUtils.jsm"); As explained in Bug 1383215 comments [21, 24], this has been incorrect for years, but happened to work. The import URL is changed so it points at the correct thing now: > Cu.import("resource://gre/modules/XPCOMUtils.jsm"); MozReview-Commit-ID: J6j594sJs60
security/manager/tools/getHSTSPreloadList.js
--- a/security/manager/tools/getHSTSPreloadList.js
+++ b/security/manager/tools/getHSTSPreloadList.js
@@ -14,17 +14,17 @@
 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource:///modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const SOURCE = "https://chromium.googlesource.com/chromium/src/net/+/master/http/transport_security_state_static.json?format=TEXT";
 const OUTPUT = "nsSTSPreloadList.inc";
 const ERROR_OUTPUT = "nsSTSPreloadList.errors";
 const MINIMUM_REQUIRED_MAX_AGE = 60 * 60 * 24 * 7 * 18;
 const MAX_CONCURRENT_REQUESTS = 5;
 const MAX_RETRIES = 3;
 const REQUEST_TIMEOUT = 30 * 1000;