mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
132 lines
4.8 KiB
JavaScript
132 lines
4.8 KiB
JavaScript
ChromeUtils.defineModuleGetter(this, "NetUtil",
|
|
"resource://gre/modules/NetUtil.jsm");
|
|
// Global test server for serving safebrowsing updates.
|
|
var gHttpServ = null;
|
|
// Global nsIUrlClassifierDBService
|
|
var gDbService = Cc["@mozilla.org/url-classifier/dbservice;1"]
|
|
.getService(Ci.nsIUrlClassifierDBService);
|
|
|
|
// A map of tables to arrays of update redirect urls.
|
|
var gTables = {};
|
|
|
|
// Construct an update from a file.
|
|
function readFileToString(aFilename) {
|
|
let f = do_get_file(aFilename);
|
|
let stream = Cc["@mozilla.org/network/file-input-stream;1"]
|
|
.createInstance(Ci.nsIFileInputStream);
|
|
stream.init(f, -1, 0, 0);
|
|
let buf = NetUtil.readInputStreamToString(stream, stream.available());
|
|
return buf;
|
|
}
|
|
|
|
// Registers a table for which to serve update chunks. Returns a promise that
|
|
// resolves when that chunk has been downloaded.
|
|
function registerTableUpdate(aTable, aFilename) {
|
|
return new Promise(resolve => {
|
|
// If we haven't been given an update for this table yet, add it to the map
|
|
if (!(aTable in gTables)) {
|
|
gTables[aTable] = [];
|
|
}
|
|
|
|
// The number of chunks associated with this table.
|
|
let numChunks = gTables[aTable].length + 1;
|
|
let redirectPath = "/" + aTable + "-" + numChunks;
|
|
let redirectUrl = "localhost:4444" + redirectPath;
|
|
|
|
// Store redirect url for that table so we can return it later when we
|
|
// process an update request.
|
|
gTables[aTable].push(redirectUrl);
|
|
|
|
gHttpServ.registerPathHandler(redirectPath, function(request, response) {
|
|
info("Mock safebrowsing server handling request for " + redirectPath);
|
|
let contents = readFileToString(aFilename);
|
|
response.setHeader("Content-Type",
|
|
"application/vnd.google.safebrowsing-update", false);
|
|
response.setStatusLine(request.httpVersion, 200, "OK");
|
|
response.bodyOutputStream.write(contents, contents.length);
|
|
resolve(contents);
|
|
});
|
|
});
|
|
}
|
|
|
|
// Construct a response with redirect urls.
|
|
function processUpdateRequest() {
|
|
let response = "n:1000\n";
|
|
for (let table in gTables) {
|
|
response += "i:" + table + "\n";
|
|
for (let i = 0; i < gTables[table].length; ++i) {
|
|
response += "u:" + gTables[table][i] + "\n";
|
|
}
|
|
}
|
|
info("Returning update response: " + response);
|
|
return response;
|
|
}
|
|
|
|
// Set up our test server to handle update requests.
|
|
function run_test() {
|
|
gHttpServ = new HttpServer();
|
|
gHttpServ.registerDirectory("/", do_get_cwd());
|
|
|
|
gHttpServ.registerPathHandler("/downloads", function(request, response) {
|
|
let blob = processUpdateRequest();
|
|
response.setHeader("Content-Type",
|
|
"application/vnd.google.safebrowsing-update", false);
|
|
response.setStatusLine(request.httpVersion, 200, "OK");
|
|
response.bodyOutputStream.write(blob, blob.length);
|
|
});
|
|
|
|
gHttpServ.start(4444);
|
|
run_next_test();
|
|
}
|
|
|
|
// Just throw if we ever get an update or download error.
|
|
function handleError(aEvent) {
|
|
do_throw("We didn't download or update correctly: " + aEvent);
|
|
}
|
|
|
|
add_test(function test_update() {
|
|
let streamUpdater = Cc["@mozilla.org/url-classifier/streamupdater;1"]
|
|
.getService(Ci.nsIUrlClassifierStreamUpdater);
|
|
|
|
// Load up some update chunks for the safebrowsing server to serve.
|
|
registerTableUpdate("goog-downloadwhite-digest256", "data/digest1.chunk");
|
|
registerTableUpdate("goog-downloadwhite-digest256", "data/digest2.chunk");
|
|
|
|
// Download some updates, and don't continue until the downloads are done.
|
|
function updateSuccess(aEvent) {
|
|
// Timeout of n:1000 is constructed in processUpdateRequest above and
|
|
// passed back in the callback in nsIUrlClassifierStreamUpdater on success.
|
|
Assert.equal("1000", aEvent);
|
|
info("All data processed");
|
|
run_next_test();
|
|
}
|
|
streamUpdater.downloadUpdates(
|
|
"goog-downloadwhite-digest256",
|
|
"goog-downloadwhite-digest256;\n",
|
|
true,
|
|
"http://localhost:4444/downloads",
|
|
updateSuccess, handleError, handleError);
|
|
});
|
|
|
|
add_test(function test_url_not_whitelisted() {
|
|
let uri = Services.io.newURI("http://example.com");
|
|
let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
|
|
gDbService.lookup(principal, "goog-downloadwhite-digest256",
|
|
function handleEvent(aEvent) {
|
|
// This URI is not on any lists.
|
|
Assert.equal("", aEvent);
|
|
run_next_test();
|
|
});
|
|
});
|
|
|
|
add_test(function test_url_whitelisted() {
|
|
// Hash of "whitelisted.com/" (canonicalized URL) is:
|
|
// 93CA5F48E15E9861CD37C2D95DB43D23CC6E6DE5C3F8FA6E8BE66F97CC518907
|
|
let uri = Services.io.newURI("http://whitelisted.com");
|
|
let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
|
|
gDbService.lookup(principal, "goog-downloadwhite-digest256",
|
|
function handleEvent(aEvent) {
|
|
Assert.equal("goog-downloadwhite-digest256", aEvent);
|
|
run_next_test();
|
|
});
|
|
});
|