copy from toolkit/components/extensions/NativeMessaging.jsm
copy to toolkit/components/extensions/NativeManifests.jsm
--- a/toolkit/components/extensions/NativeMessaging.jsm
+++ b/toolkit/components/extensions/NativeManifests.jsm
@@ -1,64 +1,34 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-this.EXPORTED_SYMBOLS = ["HostManifestManager", "NativeApp"];
-/* globals NativeApp */
+this.EXPORTED_SYMBOLS = ["NativeManifests"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-const {EventEmitter} = Cu.import("resource://gre/modules/EventEmitter.jsm", {});
-
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
- AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
- ExtensionChild: "resource://gre/modules/ExtensionChild.jsm",
OS: "resource://gre/modules/osfile.jsm",
Schemas: "resource://gre/modules/Schemas.jsm",
Services: "resource://gre/modules/Services.jsm",
- Subprocess: "resource://gre/modules/Subprocess.jsm",
- clearTimeout: "resource://gre/modules/Timer.jsm",
- setTimeout: "resource://gre/modules/Timer.jsm",
WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
const HOST_MANIFEST_SCHEMA = "chrome://extensions/content/schemas/native_host_manifest.json";
const VALID_APPLICATION = /^\w+(\.\w+)*$/;
-// For a graceful shutdown (i.e., when the extension is unloaded or when it
-// explicitly calls disconnect() on a native port), how long we give the native
-// application to exit before we start trying to kill it. (in milliseconds)
-const GRACEFUL_SHUTDOWN_TIME = 3000;
-
-// Hard limits on maximum message size that can be read/written
-// These are defined in the native messaging documentation, note that
-// the write limit is imposed by the "wire protocol" in which message
-// boundaries are defined by preceding each message with its length as
-// 4-byte unsigned integer so this is the largest value that can be
-// represented. Good luck generating a serialized message that large,
-// the practical write limit is likely to be dictated by available memory.
-const MAX_READ = 1024 * 1024;
-const MAX_WRITE = 0xffffffff;
-
-// Preferences that can lower the message size limits above,
-// used for testing the limits.
-const PREF_MAX_READ = "webextensions.native-messaging.max-input-message-bytes";
-const PREF_MAX_WRITE = "webextensions.native-messaging.max-output-message-bytes";
-
const REGPATH = "Software\\Mozilla\\NativeMessagingHosts";
-const global = this;
-
-this.HostManifestManager = {
+this.NativeManifests = {
_initializePromise: null,
_lookup: null,
init() {
if (!this._initializePromise) {
let platform = AppConstants.platform;
if (platform == "win") {
this._lookup = this._winLookup;
@@ -148,289 +118,8 @@ this.HostManifestManager = {
*/
lookupApplication(application, context) {
if (!VALID_APPLICATION.test(application)) {
throw new Error(`Invalid application "${application}"`);
}
return this.init().then(() => this._lookup(application, context));
},
};
-
-this.NativeApp = class extends EventEmitter {
- /**
- * @param {BaseContext} context The context that initiated the native app.
- * @param {string} application The identifier of the native app.
- */
- constructor(context, application) {
- super();
-
- this.context = context;
- this.name = application;
-
- // We want a close() notification when the window is destroyed.
- this.context.callOnClose(this);
-
- this.proc = null;
- this.readPromise = null;
- this.sendQueue = [];
- this.writePromise = null;
- this.sentDisconnect = false;
-
- this.startupPromise = HostManifestManager.lookupApplication(application, context)
- .then(hostInfo => {
- // Put the two errors together to not leak information about whether a native
- // application is installed to addons that do not have the right permission.
- if (!hostInfo || !hostInfo.manifest.allowed_extensions.includes(context.extension.id)) {
- throw new context.cloneScope.Error(`This extension does not have permission to use native application ${application} (or the application is not installed)`);
- }
-
- let command = hostInfo.manifest.path;
- if (AppConstants.platform == "win") {
- // OS.Path.join() ignores anything before the last absolute path
- // it sees, so if command is already absolute, it remains unchanged
- // here. If it is relative, we get the proper absolute path here.
- command = OS.Path.join(OS.Path.dirname(hostInfo.path), command);
- }
-
- let subprocessOpts = {
- command: command,
- arguments: [hostInfo.path, context.extension.id],
- workdir: OS.Path.dirname(command),
- stderr: "pipe",
- };
- return Subprocess.call(subprocessOpts);
- }).then(proc => {
- this.startupPromise = null;
- this.proc = proc;
- this._startRead();
- this._startWrite();
- this._startStderrRead();
- }).catch(err => {
- this.startupPromise = null;
- Cu.reportError(err instanceof Error ? err : err.message);
- this._cleanup(err);
- });
- }
-
- /**
- * Open a connection to a native messaging host.
- *
- * @param {BaseContext} context The context associated with the port.
- * @param {nsIMessageSender} messageManager The message manager used to send
- * and receive messages from the port's creator.
- * @param {string} portId A unique internal ID that identifies the port.
- * @param {object} sender The object describing the creator of the connection
- * request.
- * @param {string} application The name of the native messaging host.
- */
- static onConnectNative(context, messageManager, portId, sender, application) {
- let app = new NativeApp(context, application);
- let port = new ExtensionChild.Port(context, messageManager, [Services.mm], "", portId, sender, sender);
- app.once("disconnect", (what, err) => port.disconnect(err));
-
- /* eslint-disable mozilla/balanced-listeners */
- app.on("message", (what, msg) => port.postMessage(msg));
- /* eslint-enable mozilla/balanced-listeners */
-
- port.registerOnMessage(holder => app.send(holder));
- port.registerOnDisconnect(msg => app.close());
- }
-
- /**
- * @param {BaseContext} context The scope from where `message` originates.
- * @param {*} message A message from the extension, meant for a native app.
- * @returns {ArrayBuffer} An ArrayBuffer that can be sent to the native app.
- */
- static encodeMessage(context, message) {
- message = context.jsonStringify(message);
- let buffer = new TextEncoder().encode(message).buffer;
- if (buffer.byteLength > NativeApp.maxWrite) {
- throw new context.cloneScope.Error("Write too big");
- }
- return buffer;
- }
-
- // A port is definitely "alive" if this.proc is non-null. But we have
- // to provide a live port object immediately when connecting so we also
- // need to consider a port alive if proc is null but the startupPromise
- // is still pending.
- get _isDisconnected() {
- return (!this.proc && !this.startupPromise);
- }
-
- _startRead() {
- if (this.readPromise) {
- throw new Error("Entered _startRead() while readPromise is non-null");
- }
- this.readPromise = this.proc.stdout.readUint32()
- .then(len => {
- if (len > NativeApp.maxRead) {
- throw new this.context.cloneScope.Error(`Native application tried to send a message of ${len} bytes, which exceeds the limit of ${NativeApp.maxRead} bytes.`);
- }
- return this.proc.stdout.readJSON(len);
- }).then(msg => {
- this.emit("message", msg);
- this.readPromise = null;
- this._startRead();
- }).catch(err => {
- if (err.errorCode != Subprocess.ERROR_END_OF_FILE) {
- Cu.reportError(err instanceof Error ? err : err.message);
- }
- this._cleanup(err);
- });
- }
-
- _startWrite() {
- if (this.sendQueue.length == 0) {
- return;
- }
-
- if (this.writePromise) {
- throw new Error("Entered _startWrite() while writePromise is non-null");
- }
-
- let buffer = this.sendQueue.shift();
- let uintArray = Uint32Array.of(buffer.byteLength);
-
- this.writePromise = Promise.all([
- this.proc.stdin.write(uintArray.buffer),
- this.proc.stdin.write(buffer),
- ]).then(() => {
- this.writePromise = null;
- this._startWrite();
- }).catch(err => {
- Cu.reportError(err.message);
- this._cleanup(err);
- });
- }
-
- _startStderrRead() {
- let proc = this.proc;
- let app = this.name;
- (async function() {
- let partial = "";
- while (true) {
- let data = await proc.stderr.readString();
- if (data.length == 0) {
- // We have hit EOF, just stop reading
- if (partial) {
- Services.console.logStringMessage(`stderr output from native app ${app}: ${partial}`);
- }
- break;
- }
-
- let lines = data.split(/\r?\n/);
- lines[0] = partial + lines[0];
- partial = lines.pop();
-
- for (let line of lines) {
- Services.console.logStringMessage(`stderr output from native app ${app}: ${line}`);
- }
- }
- })();
- }
-
- send(holder) {
- if (this._isDisconnected) {
- throw new this.context.cloneScope.Error("Attempt to postMessage on disconnected port");
- }
- let msg = holder.deserialize(global);
- if (Cu.getClassName(msg, true) != "ArrayBuffer") {
- // This error cannot be triggered by extensions; it indicates an error in
- // our implementation.
- throw new Error("The message to the native messaging host is not an ArrayBuffer");
- }
-
- let buffer = msg;
-
- if (buffer.byteLength > NativeApp.maxWrite) {
- throw new this.context.cloneScope.Error("Write too big");
- }
-
- this.sendQueue.push(buffer);
- if (!this.startupPromise && !this.writePromise) {
- this._startWrite();
- }
- }
-
- // Shut down the native application and also signal to the extension
- // that the connect has been disconnected.
- _cleanup(err) {
- this.context.forgetOnClose(this);
-
- let doCleanup = () => {
- // Set a timer to kill the process gracefully after one timeout
- // interval and kill it forcefully after two intervals.
- let timer = setTimeout(() => {
- this.proc.kill(GRACEFUL_SHUTDOWN_TIME);
- }, GRACEFUL_SHUTDOWN_TIME);
-
- let promise = Promise.all([
- this.proc.stdin.close()
- .catch(err => {
- if (err.errorCode != Subprocess.ERROR_END_OF_FILE) {
- throw err;
- }
- }),
- this.proc.wait(),
- ]).then(() => {
- this.proc = null;
- clearTimeout(timer);
- });
-
- AsyncShutdown.profileBeforeChange.addBlocker(
- `Native Messaging: Wait for application ${this.name} to exit`,
- promise);
-
- promise.then(() => {
- AsyncShutdown.profileBeforeChange.removeBlocker(promise);
- });
-
- return promise;
- };
-
- if (this.proc) {
- doCleanup();
- } else if (this.startupPromise) {
- this.startupPromise.then(doCleanup);
- }
-
- if (!this.sentDisconnect) {
- this.sentDisconnect = true;
- if (err && err.errorCode == Subprocess.ERROR_END_OF_FILE) {
- err = null;
- }
- this.emit("disconnect", err);
- }
- }
-
- // Called from Context when the extension is shut down.
- close() {
- this._cleanup();
- }
-
- sendMessage(holder) {
- let responsePromise = new Promise((resolve, reject) => {
- this.once("message", (what, msg) => { resolve(msg); });
- this.once("disconnect", (what, err) => { reject(err); });
- });
-
- let result = this.startupPromise.then(() => {
- this.send(holder);
- return responsePromise;
- });
-
- result.then(() => {
- this._cleanup();
- }, () => {
- // Prevent the response promise from being reported as an
- // unchecked rejection if the startup promise fails.
- responsePromise.catch(() => {});
-
- this._cleanup();
- });
-
- return result;
- }
-};
-
-XPCOMUtils.defineLazyPreferenceGetter(NativeApp, "maxRead", PREF_MAX_READ, MAX_READ);
-XPCOMUtils.defineLazyPreferenceGetter(NativeApp, "maxWrite", PREF_MAX_WRITE, MAX_WRITE);
--- a/toolkit/components/extensions/NativeMessaging.jsm
+++ b/toolkit/components/extensions/NativeMessaging.jsm
@@ -1,39 +1,34 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
-this.EXPORTED_SYMBOLS = ["HostManifestManager", "NativeApp"];
-/* globals NativeApp */
+this.EXPORTED_SYMBOLS = ["NativeApp"];
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
const {EventEmitter} = Cu.import("resource://gre/modules/EventEmitter.jsm", {});
XPCOMUtils.defineLazyModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.jsm",
AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
ExtensionChild: "resource://gre/modules/ExtensionChild.jsm",
+ NativeManifests: "resource://gre/modules/NativeManifests.jsm",
OS: "resource://gre/modules/osfile.jsm",
- Schemas: "resource://gre/modules/Schemas.jsm",
Services: "resource://gre/modules/Services.jsm",
Subprocess: "resource://gre/modules/Subprocess.jsm",
clearTimeout: "resource://gre/modules/Timer.jsm",
setTimeout: "resource://gre/modules/Timer.jsm",
- WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
});
-const HOST_MANIFEST_SCHEMA = "chrome://extensions/content/schemas/native_host_manifest.json";
-const VALID_APPLICATION = /^\w+(\.\w+)*$/;
-
// For a graceful shutdown (i.e., when the extension is unloaded or when it
// explicitly calls disconnect() on a native port), how long we give the native
// application to exit before we start trying to kill it. (in milliseconds)
const GRACEFUL_SHUTDOWN_TIME = 3000;
// Hard limits on maximum message size that can be read/written
// These are defined in the native messaging documentation, note that
// the write limit is imposed by the "wire protocol" in which message
@@ -44,121 +39,18 @@ const GRACEFUL_SHUTDOWN_TIME = 3000;
const MAX_READ = 1024 * 1024;
const MAX_WRITE = 0xffffffff;
// Preferences that can lower the message size limits above,
// used for testing the limits.
const PREF_MAX_READ = "webextensions.native-messaging.max-input-message-bytes";
const PREF_MAX_WRITE = "webextensions.native-messaging.max-output-message-bytes";
-const REGPATH = "Software\\Mozilla\\NativeMessagingHosts";
-
const global = this;
-this.HostManifestManager = {
- _initializePromise: null,
- _lookup: null,
-
- init() {
- if (!this._initializePromise) {
- let platform = AppConstants.platform;
- if (platform == "win") {
- this._lookup = this._winLookup;
- } else if (platform == "macosx" || platform == "linux") {
- let dirs = [
- Services.dirsvc.get("XREUserNativeManifests", Ci.nsIFile).path,
- Services.dirsvc.get("XRESysNativeManifests", Ci.nsIFile).path,
- ];
- this._lookup = (application, context) => this._tryPaths(application, dirs, context);
- } else {
- throw new Error(`Native messaging is not supported on ${AppConstants.platform}`);
- }
- this._initializePromise = Schemas.load(HOST_MANIFEST_SCHEMA);
- }
- return this._initializePromise;
- },
-
- _winLookup(application, context) {
- const REGISTRY = Ci.nsIWindowsRegKey;
- let regPath = `${REGPATH}\\${application}`;
- let path = WindowsRegistry.readRegKey(REGISTRY.ROOT_KEY_CURRENT_USER,
- regPath, "", REGISTRY.WOW64_64);
- if (!path) {
- path = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
- regPath, "", REGISTRY.WOW64_64);
- }
- if (!path) {
- return null;
- }
- return this._tryPath(path, application, context)
- .then(manifest => manifest ? {path, manifest} : null);
- },
-
- _tryPath(path, application, context) {
- return Promise.resolve()
- .then(() => OS.File.read(path, {encoding: "utf-8"}))
- .then(data => {
- let manifest;
- try {
- manifest = JSON.parse(data);
- } catch (ex) {
- let msg = `Error parsing native host manifest ${path}: ${ex.message}`;
- Cu.reportError(msg);
- return null;
- }
-
- let normalized = Schemas.normalize(manifest, "manifest.NativeHostManifest", context);
- if (normalized.error) {
- Cu.reportError(normalized.error);
- return null;
- }
- manifest = normalized.value;
- if (manifest.name != application) {
- let msg = `Native host manifest ${path} has name property ${manifest.name} (expected ${application})`;
- Cu.reportError(msg);
- return null;
- }
- return normalized.value;
- }).catch(ex => {
- if (ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
- return null;
- }
- throw ex;
- });
- },
-
- async _tryPaths(application, dirs, context) {
- for (let dir of dirs) {
- let path = OS.Path.join(dir, `${application}.json`);
- let manifest = await this._tryPath(path, application, context);
- if (manifest) {
- return {path, manifest};
- }
- }
- return null;
- },
-
- /**
- * Search for a valid native host manifest for the given application name.
- * The directories searched and rules for manifest validation are all
- * detailed in the native messaging documentation.
- *
- * @param {string} application The name of the applciation to search for.
- * @param {object} context A context object as expected by Schemas.normalize.
- * @returns {object} The contents of the validated manifest, or null if
- * no valid manifest can be found for this application.
- */
- lookupApplication(application, context) {
- if (!VALID_APPLICATION.test(application)) {
- throw new Error(`Invalid application "${application}"`);
- }
- return this.init().then(() => this._lookup(application, context));
- },
-};
-
this.NativeApp = class extends EventEmitter {
/**
* @param {BaseContext} context The context that initiated the native app.
* @param {string} application The identifier of the native app.
*/
constructor(context, application) {
super();
@@ -169,17 +61,17 @@ this.NativeApp = class extends EventEmit
this.context.callOnClose(this);
this.proc = null;
this.readPromise = null;
this.sendQueue = [];
this.writePromise = null;
this.sentDisconnect = false;
- this.startupPromise = HostManifestManager.lookupApplication(application, context)
+ this.startupPromise = NativeManifests.lookupApplication(application, context)
.then(hostInfo => {
// Put the two errors together to not leak information about whether a native
// application is installed to addons that do not have the right permission.
if (!hostInfo || !hostInfo.manifest.allowed_extensions.includes(context.extension.id)) {
throw new context.cloneScope.Error(`This extension does not have permission to use native application ${application} (or the application is not installed)`);
}
let command = hostInfo.manifest.path;
--- a/toolkit/components/extensions/moz.build
+++ b/toolkit/components/extensions/moz.build
@@ -20,16 +20,17 @@ EXTRA_JS_MODULES += [
'ExtensionPreferencesManager.jsm',
'ExtensionSettingsStore.jsm',
'ExtensionStorage.jsm',
'ExtensionStorageSync.jsm',
'ExtensionUtils.jsm',
'FindContent.jsm',
'LegacyExtensionsUtils.jsm',
'MessageChannel.jsm',
+ 'NativeManifests.jsm',
'NativeMessaging.jsm',
'ProxyScriptContext.jsm',
'Schemas.jsm',
]
EXTRA_COMPONENTS += [
'extension-process-script.js',
'extensions-toolkit.manifest',
rename from toolkit/components/extensions/test/xpcshell/test_native_messaging.js
rename to toolkit/components/extensions/test/xpcshell/test_native_manifests.js
--- a/toolkit/components/extensions/test/xpcshell/test_native_messaging.js
+++ b/toolkit/components/extensions/test/xpcshell/test_native_manifests.js
@@ -1,14 +1,14 @@
"use strict";
-/* global OS, HostManifestManager, NativeApp */
Cu.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/AsyncShutdown.jsm");
Cu.import("resource://gre/modules/ExtensionCommon.jsm");
+Cu.import("resource://gre/modules/NativeManifests.jsm");
Cu.import("resource://gre/modules/FileUtils.jsm");
Cu.import("resource://gre/modules/Schemas.jsm");
Cu.import("resource://gre/modules/Services.jsm");
const {Subprocess, SubprocessImpl} = Cu.import("resource://gre/modules/Subprocess.jsm", {});
Cu.import("resource://gre/modules/NativeMessaging.jsm");
Cu.import("resource://gre/modules/osfile.jsm");
let registry = null;
@@ -68,17 +68,17 @@ add_task(async function setup() {
if (PYTHON == null) {
PYTHON = await Subprocess.pathSearch("python");
}
notEqual(PYTHON, null, "Found a suitable python interpreter");
});
let global = this;
-// Test of HostManifestManager.lookupApplication() begin here...
+// Test of NativeManifests.lookupApplication() begin here...
let context = {
url: null,
jsonStringify(...args) { return JSON.stringify(...args); },
cloneScope: global,
logError() {},
preprocessors: {},
callOnClose: () => {},
forgetOnClose: () => {},
@@ -103,55 +103,59 @@ class MockContext extends ExtensionCommo
let templateManifest = {
name: "test",
description: "this is only a test",
path: "/bin/cat",
type: "stdio",
allowed_extensions: ["extension@tests.mozilla.org"],
};
+function lookupApplication(app, ctx) {
+ return NativeManifests.lookupApplication(app, ctx);
+}
+
add_task(async function test_nonexistent_manifest() {
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, "lookupApplication returns null for non-existent application");
});
const USER_TEST_JSON = OS.Path.join(userDir.path, "test.json");
add_task(async function test_good_manifest() {
await writeManifest(USER_TEST_JSON, templateManifest);
if (registry) {
registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
`${REGPATH}\\test`, "", USER_TEST_JSON);
}
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
notEqual(result, null, "lookupApplication finds a good manifest");
equal(result.path, USER_TEST_JSON, "lookupApplication returns the correct path");
deepEqual(result.manifest, templateManifest, "lookupApplication returns the manifest contents");
});
add_task(async function test_invalid_json() {
await writeManifest(USER_TEST_JSON, "this is not valid json");
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, "lookupApplication ignores bad json");
});
add_task(async function test_invalid_name() {
let manifest = Object.assign({}, templateManifest);
manifest.name = "../test";
await writeManifest(USER_TEST_JSON, manifest);
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, "lookupApplication ignores an invalid name");
});
add_task(async function test_name_mismatch() {
let manifest = Object.assign({}, templateManifest);
manifest.name = "not test";
await writeManifest(USER_TEST_JSON, manifest);
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
let what = (AppConstants.platform == "win") ? "registry key" : "json filename";
equal(result, null, `lookupApplication ignores mistmatch between ${what} and name property`);
});
add_task(async function test_missing_props() {
const PROPS = [
"name",
"description",
@@ -159,34 +163,34 @@ add_task(async function test_missing_pro
"type",
"allowed_extensions",
];
for (let prop of PROPS) {
let manifest = Object.assign({}, templateManifest);
delete manifest[prop];
await writeManifest(USER_TEST_JSON, manifest);
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, `lookupApplication ignores missing ${prop}`);
}
});
add_task(async function test_invalid_type() {
let manifest = Object.assign({}, templateManifest);
manifest.type = "bogus";
await writeManifest(USER_TEST_JSON, manifest);
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, "lookupApplication ignores invalid type");
});
add_task(async function test_no_allowed_extensions() {
let manifest = Object.assign({}, templateManifest);
manifest.allowed_extensions = [];
await writeManifest(USER_TEST_JSON, manifest);
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
equal(result, null, "lookupApplication ignores manifest with no allowed_extensions");
});
const GLOBAL_TEST_JSON = OS.Path.join(globalDir.path, "test.json");
let globalManifest = Object.assign({}, templateManifest);
globalManifest.description = "This manifest is from the systemwide directory";
add_task(async function good_manifest_system_dir() {
@@ -195,32 +199,32 @@ add_task(async function good_manifest_sy
if (registry) {
registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
`${REGPATH}\\test`, "", null);
registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_LOCAL_MACHINE,
`${REGPATH}\\test`, "", GLOBAL_TEST_JSON);
}
let where = (AppConstants.platform == "win") ? "registry location" : "directory";
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
notEqual(result, null, `lookupApplication finds a manifest in the system-wide ${where}`);
equal(result.path, GLOBAL_TEST_JSON, `lookupApplication returns path in the system-wide ${where}`);
deepEqual(result.manifest, globalManifest, `lookupApplication returns manifest contents from the system-wide ${where}`);
});
add_task(async function test_user_dir_precedence() {
await writeManifest(USER_TEST_JSON, templateManifest);
if (registry) {
registry.setValue(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
`${REGPATH}\\test`, "", USER_TEST_JSON);
}
// global test.json and LOCAL_MACHINE registry key on windows are
// still present from the previous test
- let result = await HostManifestManager.lookupApplication("test", context);
+ let result = await lookupApplication("test", context);
notEqual(result, null, "lookupApplication finds a manifest when entries exist in both user-specific and system-wide locations");
equal(result.path, USER_TEST_JSON, "lookupApplication returns the user-specific path when user-specific and system-wide entries both exist");
deepEqual(result.manifest, templateManifest, "lookupApplication returns user-specific manifest contents with user-specific and system-wide entries both exist");
});
// Test shutdown handling in NativeApp
add_task(async function test_native_app_shutdown() {
const SCRIPT = String.raw`
--- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
@@ -64,12 +64,12 @@ skip-if = os == "android"
head = head.js head_sync.js
skip-if = os == "android"
[test_ext_storage_sync_crypto.js]
skip-if = os == "android"
[test_ext_storage_telemetry.js]
skip-if = os == "android" # checking for telemetry needs to be updated: 1384923
[test_ext_topSites.js]
skip-if = os == "android"
-[test_native_messaging.js]
+[test_native_manifests.js]
skip-if = os == "android"
[test_proxy_scripts.js]
skip-if = os == "linux" # bug 1393940
--- a/tools/lint/eslint/modules.json
+++ b/tools/lint/eslint/modules.json
@@ -64,16 +64,17 @@
"event-emitter.js": ["EventEmitter"],
"EventUtils.js": ["disableNonTestMouseEvents", "sendMouseEvent", "sendChar", "sendString", "sendKey", "synthesizeMouse", "synthesizeTouch", "synthesizeMouseAtPoint", "synthesizeTouchAtPoint", "synthesizeMouseAtCenter", "synthesizeTouchAtCenter", "synthesizeWheel", "synthesizeKey", "synthesizeMouseExpectEvent", "synthesizeKeyExpectEvent", "synthesizeText", "synthesizeComposition", "synthesizeQuerySelectedText"],
"Extension.jsm": ["Extension", "ExtensionData"],
"ExtensionAPI.jsm": ["ExtensionAPI", "ExtensionAPIs"],
"ExtensionsUI.jsm": ["ExtensionsUI"],
"ExtensionTabs.jsm": ["TabTrackerBase", "TabManagerBase", "TabBase", "WindowTrackerBase", "WindowManagerBase", "WindowBase"],
"extension-storage.js": ["ExtensionStorageEngine", "EncryptionRemoteTransformer", "KeyRingEncryptionRemoteTransformer"],
"ExtensionXPCShellUtils.jsm": ["ExtensionTestUtils"],
+ "NativeManifests.jsm": ["NativeManifests"],
"fakeservices.js": ["FakeCryptoService", "FakeFilesystemService", "FakeGUIDService", "fakeSHA256HMAC"],
"file_expandosharing.jsm": ["checkFromJSM"],
"file_stringencoding.jsm": ["checkFromJSM"],
"file_url.jsm": ["checkFromJSM"],
"file_worker_url.jsm": ["checkFromJSM"],
"Finder.jsm": ["Finder", "GetClipboardSearchString"],
"forms.js": ["FormEngine", "FormRec", "FormValidator"],
"forms.jsm": ["FormData"],
@@ -136,17 +137,17 @@
"MessageContext.jsm": ["MessageContext"],
"Messaging.jsm": ["sendMessageToJava", "Messaging", "EventDispatcher"],
"microformat-shiv.js": ["Microformats"],
"MigrationUtils.jsm": ["MigrationUtils", "MigratorPrototype"],
"mozelement.js": ["Elem", "Selector", "ID", "Link", "XPath", "Name", "Lookup", "MozMillElement", "MozMillCheckBox", "MozMillRadio", "MozMillDropList", "MozMillTextBox", "subclasses"],
"mozmill.js": ["controller", "utils", "elementslib", "os", "getBrowserController", "newBrowserController", "getAddonsController", "getPreferencesController", "newMail3PaneController", "getMail3PaneController", "wm", "platform", "getAddrbkController", "getMsgComposeController", "getDownloadsController", "Application", "findElement", "getPlacesController", "isMac", "isLinux", "isWindows", "firePythonCallback", "getAddons"],
"msgbroker.js": ["addListener", "addObject", "removeListener", "sendMessage", "log", "pass", "fail"],
"MulticastDNSAndroid.jsm": ["MulticastDNS"],
- "NativeMessaging.jsm": ["HostManifestManager", "NativeApp"],
+ "NativeMessaging.jsm": ["NativeApp"],
"NotificationDB.jsm": [],
"nsFormAutoCompleteResult.jsm": ["FormAutoCompleteResult"],
"objects.js": ["getLength"],
"observers.js": ["Observers"],
"offlineAppCache.jsm": ["OfflineAppCacheHelper"],
"OrientationChangeHandler.jsm": [],
"os.js": ["listDirectory", "getFileForPath", "abspath", "getPlatform"],
"osfile.jsm": ["OS", "require"],