gecko-dev/dom/ipc/manifestMessages.js

92 lines
2.8 KiB
JavaScript
Raw Normal View History

/* 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/.*/
/*
* Manifest obtainer frame script implementation of:
* http://www.w3.org/TR/appmanifest/#obtaining
*
* It searches a top-level browsing context for
* a <link rel=manifest> element. Then fetches
* and processes the linked manifest.
*
* BUG: https://bugzilla.mozilla.org/show_bug.cgi?id=1083410
*/
/*globals Task, ManifestObtainer, ManifestFinder, content, sendAsyncMessage, addMessageListener, Components*/
"use strict";
const {
Bug 1089255 - Implement and test manifest-src CSP directive. r=bholley, r=dveditz, r=ckerschb --- dom/base/nsContentPolicyUtils.h | 1 + dom/base/nsDataDocumentContentPolicy.cpp | 3 +- dom/base/nsIContentPolicy.idl | 2 +- dom/base/nsIContentPolicyBase.idl | 7 +- dom/base/nsISimpleContentPolicy.idl | 2 +- dom/base/test/csp/browser.ini | 4 + dom/base/test/csp/browser_test_web_manifest.js | 265 +++++++++++++++++++++ .../csp/browser_test_web_manifest_mixed_content.js | 55 +++++ dom/base/test/csp/file_CSP_web_manifest.html | 6 + dom/base/test/csp/file_CSP_web_manifest.json | 1 + .../test/csp/file_CSP_web_manifest.json^headers^ | 1 + dom/base/test/csp/file_CSP_web_manifest_https.html | 4 + dom/base/test/csp/file_CSP_web_manifest_https.json | 1 + .../csp/file_CSP_web_manifest_mixed_content.html | 9 + .../test/csp/file_CSP_web_manifest_remote.html | 8 + dom/base/test/csp/file_csp_testserver.sjs | 14 +- dom/base/test/csp/mochitest.ini | 7 + dom/base/test/moz.build | 5 +- dom/fetch/InternalRequest.cpp | 3 + dom/fetch/InternalRequest.h | 2 +- .../security/nsIContentSecurityPolicy.idl | 3 +- dom/ipc/manifestMessages.js | 25 +- dom/security/nsCSPUtils.cpp | 7 + dom/security/nsCSPUtils.h | 10 +- dom/security/nsMixedContentBlocker.cpp | 1 + dom/webidl/CSPDictionaries.webidl | 1 + extensions/permissions/nsContentBlocker.cpp | 6 +- netwerk/mime/nsMimeTypes.h | 1 + 28 files changed, 439 insertions(+), 15 deletions(-) create mode 100644 dom/base/test/csp/browser.ini create mode 100644 dom/base/test/csp/browser_test_web_manifest.js create mode 100644 dom/base/test/csp/browser_test_web_manifest_mixed_content.js create mode 100644 dom/base/test/csp/file_CSP_web_manifest.html create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json^headers^ create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.html create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.json create mode 100644 dom/base/test/csp/file_CSP_web_manifest_mixed_content.html create mode 100644 dom/base/test/csp/file_CSP_web_manifest_remote.html
2015-06-02 19:42:19 +00:00
utils: Cu,
} = Components;
Cu.import("resource://gre/modules/ManifestObtainer.jsm");
Cu.import("resource://gre/modules/ManifestFinder.jsm");
Cu.import("resource://gre/modules/Task.jsm");
const MessageHandler = {
registerListeners() {
addMessageListener(
"DOM:WebManifest:hasManifestLink",
this.hasManifestLink.bind(this)
);
addMessageListener(
"DOM:ManifestObtainer:Obtain",
this.obtainManifest.bind(this)
);
},
/**
* Check if the content document includes a link to a web manifest.
* @param {Object} aMsg The IPC message, which is destructured to just
* get the id.
*/
hasManifestLink({data: {id}}) {
const response = makeMsgResponse(id);
response.result = ManifestFinder.contentHasManifestLink(content);
response.success = true;
sendAsyncMessage("DOM:WebManifest:hasManifestLink", response);
},
/**
* Asynchronously obtains a web manifest from content by using the
* ManifestObtainer and messages back the result.
* @param {Object} aMsg The IPC message, which is destructured to just
* get the id.
*/
obtainManifest: Task.async(function* ({data: {id}}) {
const response = makeMsgResponse(id);
try {
response.result = yield ManifestObtainer.contentObtainManifest(content);
response.success = true;
} catch (err) {
response.result = serializeError(err);
}
sendAsyncMessage("DOM:ManifestObtainer:Obtain", response);
}),
};
/**
* Utility function to Serializes an JS Error, so it can be transferred over
* the message channel.
* FIX ME: https://bugzilla.mozilla.org/show_bug.cgi?id=1172586
* @param {Error} aError The error to serialize.
* @return {Object} The serialized object.
*/
function serializeError(aError) {
const clone = {
"fileName": aError.fileName,
"lineNumber": aError.lineNumber,
"columnNumber": aError.columnNumber,
"stack": aError.stack,
"message": aError.message,
"name": aError.name
};
return clone;
}
Bug 1171200 - Add means of checking if a document links to a manifest. r=billm. --- dom/ipc/manifestMessages.js | 166 +++++++++----------- ...ObjectProcessor.js => ImageObjectProcessor.jsm} | 0 dom/manifest/ManifestFinder.jsm | 58 +++++++ dom/manifest/ManifestObtainer.js | 92 ----------- dom/manifest/ManifestObtainer.jsm | 170 +++++++++++++++++++++ ...{ManifestProcessor.js => ManifestProcessor.jsm} | 18 +-- .../{ValueExtractor.js => ValueExtractor.jsm} | 4 +- dom/manifest/WebManifest.jsm | 19 --- dom/manifest/moz.build | 10 +- dom/manifest/test/browser.ini | 3 +- .../test/browser_ManifestObtainer_obtain.js | 2 +- dom/manifest/test/browser_hasManifestLink.js | 109 +++++++++++++ dom/manifest/test/common.js | 4 +- dom/security/test/csp/browser_test_web_manifest.js | 12 +- .../csp/browser_test_web_manifest_mixed_content.js | 10 +- toolkit/modules/PromiseMessage.jsm | 36 +++++ toolkit/modules/moz.build | 1 + 17 files changed, 467 insertions(+), 247 deletions(-) rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%) create mode 100644 dom/manifest/ManifestFinder.jsm delete mode 100644 dom/manifest/ManifestObtainer.js create mode 100644 dom/manifest/ManifestObtainer.jsm rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%) rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%) delete mode 100644 dom/manifest/WebManifest.jsm create mode 100644 dom/manifest/test/browser_hasManifestLink.js create mode 100644 toolkit/modules/PromiseMessage.jsm --HG-- rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-08 03:26:32 +00:00
function makeMsgResponse(aId) {
return {
id: aId,
success: false,
result: undefined
Bug 1171200 - Add means of checking if a document links to a manifest. r=billm. --- dom/ipc/manifestMessages.js | 166 +++++++++----------- ...ObjectProcessor.js => ImageObjectProcessor.jsm} | 0 dom/manifest/ManifestFinder.jsm | 58 +++++++ dom/manifest/ManifestObtainer.js | 92 ----------- dom/manifest/ManifestObtainer.jsm | 170 +++++++++++++++++++++ ...{ManifestProcessor.js => ManifestProcessor.jsm} | 18 +-- .../{ValueExtractor.js => ValueExtractor.jsm} | 4 +- dom/manifest/WebManifest.jsm | 19 --- dom/manifest/moz.build | 10 +- dom/manifest/test/browser.ini | 3 +- .../test/browser_ManifestObtainer_obtain.js | 2 +- dom/manifest/test/browser_hasManifestLink.js | 109 +++++++++++++ dom/manifest/test/common.js | 4 +- dom/security/test/csp/browser_test_web_manifest.js | 12 +- .../csp/browser_test_web_manifest_mixed_content.js | 10 +- toolkit/modules/PromiseMessage.jsm | 36 +++++ toolkit/modules/moz.build | 1 + 17 files changed, 467 insertions(+), 247 deletions(-) rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%) create mode 100644 dom/manifest/ManifestFinder.jsm delete mode 100644 dom/manifest/ManifestObtainer.js create mode 100644 dom/manifest/ManifestObtainer.jsm rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%) rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%) delete mode 100644 dom/manifest/WebManifest.jsm create mode 100644 dom/manifest/test/browser_hasManifestLink.js create mode 100644 toolkit/modules/PromiseMessage.jsm --HG-- rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-08 03:26:32 +00:00
};
}
MessageHandler.registerListeners();