prin = BasePrincipal::CreateCodebasePrincipal(uri, attrs);
@@ -480,6 +502,8 @@ nsScriptSecurityManager::ContentSecurityPolicyPermitsJSAction(JSContext *cx)
if (const char *file = scriptFilename.get()) {
CopyUTF8toUTF16(nsDependentCString(file), fileName);
}
+ } else {
+ MOZ_ASSERT(!JS_IsExceptionPending(cx));
}
csp->LogViolationDetails(nsIContentSecurityPolicy::VIOLATION_TYPE_EVAL,
fileName,
diff --git a/caps/tests/mochitest/chrome.ini b/caps/tests/mochitest/chrome.ini
index 65bfedd1a9..818638f2da 100644
--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,5 +1,5 @@
[DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
support-files =
file_disableScript.html
diff --git a/caps/tests/mochitest/mochitest.ini b/caps/tests/mochitest/mochitest.ini
index e005135f9a..2925995ec8 100644
--- a/caps/tests/mochitest/mochitest.ini
+++ b/caps/tests/mochitest/mochitest.ini
@@ -4,7 +4,6 @@ support-files =
file_disableScript.html
[test_app_principal_equality.html]
-skip-if = e10s
[test_bug246699.html]
[test_bug292789.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
diff --git a/caps/tests/mochitest/test_app_principal_equality.html b/caps/tests/mochitest/test_app_principal_equality.html
index 927bbce62b..f59f1f7893 100644
--- a/caps/tests/mochitest/test_app_principal_equality.html
+++ b/caps/tests/mochitest/test_app_principal_equality.html
@@ -13,25 +13,47 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=777467
Mozilla Bug 777467
-
-
-
-
-
-
-
+
+
+
+
diff --git a/caps/tests/mochitest/test_bug292789.html b/caps/tests/mochitest/test_bug292789.html
index 23af04e317..4f7862c0e8 100644
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -54,8 +54,8 @@ function testScriptSrc(aCallback) {
/** ![]()
tests **/
var img_global = "chrome://global/skin/icons/Error.png";
-var img_mozapps = "chrome://mozapps/skin/passwordmgr/key.png";
-var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png";
+var img_mozapps = "chrome://mozapps/skin/passwordmgr/key-16.png";
+var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-16.png";
var imgTests = [[img_global, "success"],
[img_mozapps, "fail"],
@@ -74,14 +74,14 @@ function finishTest() {
}
function fail(event) {
- is(event.target.expected, "fail",
+ is("fail", event.target.expected,
"content should not be allowed to load "+event.target.src);
if (event.target.callback)
event.target.callback();
}
function success(event) {
- is(event.target.expected, "success",
+ is("success", event.target.expected,
"content should be able to load "+event.target.src);
if (event.target.callback)
event.target.callback();
diff --git a/caps/tests/mochitest/test_extensionURL.html b/caps/tests/mochitest/test_extensionURL.html
index 7e05453f29..d5822e5fcf 100644
--- a/caps/tests/mochitest/test_extensionURL.html
+++ b/caps/tests/mochitest/test_extensionURL.html
@@ -121,15 +121,33 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1161831
return p;
}
+ function testXHR(url, shouldThrow) {
+ return new Promise(function(resolve, reject) {
+ var xhr = new XMLHttpRequest();
+ xhr.addEventListener("load", () => { ok(!shouldThrow, "XHR succeeded for " + url); resolve(); });
+ xhr.addEventListener("error", () => { ok(false, "Unexpected XHR error: " + url); resolve(); });
+ try {
+ xhr.open("GET", url, true);
+ xhr.send();
+ } catch (e) {
+ ok(shouldThrow, "XHR threw for " + url);
+ resolve();
+ }
+ });
+ }
+
//
// Perform some loads and make sure they work correctly.
//
testLoad.bind(null, 'moz-extension://cherise', navigateFromChromeWithLocation)()
.then(testLoad.bind(null, 'moz-extension://cherise', navigateFromChromeWithWebNav))
.then(testLoad.bind(null, 'moz-extension://cherise', navigateWithLocation, /* shouldThrow = */ true))
+ .then(testXHR.bind(null, 'moz-extension://cherise', /* shouldThrow = */ true))
.then(setWhitelistCallback.bind(null, /cherise/))
.then(testLoad.bind(null, 'moz-extension://cherise', navigateWithLocation))
+ .then(testXHR.bind(null, 'moz-extension://cherise'))
.then(testLoad.bind(null, 'moz-extension://liebchen', navigateWithLocation, /* shouldThrow = */ true))
+ .then(testXHR.bind(null, 'moz-extension://liebchen', /* shouldThrow = */ true))
.then(setWhitelistCallback.bind(null, /cherise|liebchen/))
.then(testLoad.bind(null, 'moz-extension://liebchen', navigateWithLocation))
.then(testLoad.bind(null, 'moz-extension://liebchen', navigateWithSrc))
diff --git a/caps/tests/mochitest/test_principal_jarprefix_origin_appid_appstatus.html b/caps/tests/mochitest/test_principal_jarprefix_origin_appid_appstatus.html
index 9f8e677d77..15f488f525 100644
--- a/caps/tests/mochitest/test_principal_jarprefix_origin_appid_appstatus.html
+++ b/caps/tests/mochitest/test_principal_jarprefix_origin_appid_appstatus.html
@@ -33,6 +33,8 @@ SimpleTest.waitForExplicitFinish();
* valid, the iframe will not be considered as a mozapp.
* - browser: say if the iframe should be a mozbrowser. This is implicit when
* app is set.
+ * - isolated: if origin isolation is enabled with browser frames. Defaults to
+ * true if unset.
* - test: an array of tests to run for this test case:
* - eo-unique: the extendedOrigin of the prinicpal must be unique in the
* current list.
@@ -230,7 +232,7 @@ var gData = [
},
test: [ "child-has-different-eo", "child-has-same-appstatus", "child-has-same-appid" ],
},
- // browser containing an iframe is part of the browser
+ // browser containing an iframe that is part of the browser
{
src: "http://example.org/",
isapp: false,
@@ -242,6 +244,49 @@ var gData = [
},
test: [ "child-has-same-eo" ],
},
+ // iframe containing a browser with isolation disabled
+ // (only chrome documents can disable isolation)
+ {
+ src: "http://example.org/",
+ isapp: false,
+ browser: false,
+ child: {
+ src: "http://example.org/chrome/",
+ isapp: false,
+ browser: true,
+ isolated: false,
+ inIsolatedMozBrowser: true,
+ },
+ test: [ "child-has-different-eo" ],
+ },
+ // browser with isolation disabled containing an iframe that is part of the browser
+ {
+ src: "http://example.org/",
+ isapp: false,
+ browser: true,
+ isolated: false,
+ child: {
+ src: "http://example.org/chrome/",
+ isapp: false,
+ inIsolatedMozBrowser: false,
+ },
+ test: [ "child-has-same-eo" ],
+ },
+ // iframe with isolation enabled containing an iframe with isolation disabled
+ // (isolated only has an effect on browsers)
+ {
+ src: "http://example.org/",
+ isapp: false,
+ browser: false,
+ isolated: true,
+ child: {
+ src: "http://example.org/chrome/",
+ isapp: false,
+ browser: false,
+ isolated: false,
+ },
+ test: [ "child-has-same-eo" ],
+ },
];
// The list of all data ids generated by this test.
@@ -280,12 +325,15 @@ function checkIFrame(aFrame, data) {
"principals from non-installed app should have NO_APP_ID");
}
- if (!data.isapp && !data.browser) {
+ if (!data.isapp && !data.browser ||
+ (data.browser && data.isolated === false)) {
is(principal.jarPrefix, "",
- 'jarPrefix should return an empty string for non-app and non-browsers principals');
+ "jarPrefix should return an empty string for non-app, non-browsers, " +
+ "and browsers with isolation disabled");
} else {
isnot(principal.jarPrefix, "",
- 'jarPrefix should not return an empty string for apps or mozbrowsers');
+ "jarPrefix should not return an empty string for apps or browsers " +
+ "with isolation enabled");
}
if (data.test.indexOf("eo-unique") != -1) {
@@ -297,7 +345,11 @@ function checkIFrame(aFrame, data) {
"extended origin should be the same as the last inserted one");
}
- is(principal.isInBrowserElement, !!data.browser,
+ let isolationExpected = false;
+ if (data.isolated !== false) {
+ isolationExpected = !!data.browser;
+ }
+ is(principal.isInBrowserElement, isolationExpected,
"check principal.isInBrowserElement");
if (data.child) {
@@ -308,7 +360,14 @@ function checkIFrame(aFrame, data) {
"child should be an installed app");
}
- is(childPrincipal.isInBrowserElement, !!data.child.browser || !!data.child.inBrowser,
+ let childIsolationExpected = false;
+ if (data.child.isolated !== false) {
+ childIsolationExpected = !!data.child.browser;
+ }
+ if (data.child.inIsolatedMozBrowser !== undefined) {
+ childIsolationExpected = data.child.inIsolatedMozBrowser;
+ }
+ is(childPrincipal.isInBrowserElement, childIsolationExpected,
"check childPrincipal.isInBrowserElement");
if (data.test.indexOf("child-has-same-eo") != -1) {
@@ -392,6 +451,10 @@ function runTest() {
childFrame.setAttribute('mozbrowser', '');
}
+ if (data.child.isolated === false) {
+ childFrame.setAttribute("noisolation", "");
+ }
+
childFrame.src = data.child.src;
this.removeEventListener('load', this.addChild.bind(this));
@@ -407,6 +470,10 @@ function runTest() {
iframe.setAttribute('mozbrowser', '');
}
+ if (data.isolated === false) {
+ iframe.setAttribute("noisolation", "");
+ }
+
iframe.src = data.src;
if (data.child) {
@@ -423,8 +490,9 @@ function runTest() {
var gTestRunner = runTest();
-SpecialPowers.pushPrefEnv({'set':[["dom.mozBrowserFramesEnabled", true]]},
- function() { gTestRunner.next(); });
+SpecialPowers.pushPrefEnv({"set": [
+ ["dom.mozBrowserFramesEnabled", true],
+]}, function() { gTestRunner.next(); });
diff --git a/dom/activities/tests/mochi/common.js b/dom/activities/tests/mochi/common.js
index 71d167d690..9f32d0e6bd 100644
--- a/dom/activities/tests/mochi/common.js
+++ b/dom/activities/tests/mochi/common.js
@@ -1,4 +1,4 @@
-const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
const ACTIVITY_GLUE_CID = Components.ID("{f4cfbe10-a106-4cd1-b04e-0d2a6aac138b}");
const SYS_MSG_GLUE_CID = Components.ID("{b0b6b9af-bc4e-4200-bffe-fb7691065ec9}");
diff --git a/dom/animation/AnimationEffectTiming.cpp b/dom/animation/AnimationEffectTiming.cpp
index ed1332b6f4..7b84b84b04 100644
--- a/dom/animation/AnimationEffectTiming.cpp
+++ b/dom/animation/AnimationEffectTiming.cpp
@@ -19,11 +19,11 @@ AnimationEffectTiming::WrapObject(JSContext* aCx, JS::Handle aGivenPr
return AnimationEffectTimingBinding::Wrap(aCx, this, aGivenProto);
}
-void
-AnimationEffectTiming::NotifyTimingUpdate()
+static inline void
+PostSpecifiedTimingUpdated(KeyframeEffect* aEffect)
{
- if (mEffect) {
- mEffect->NotifySpecifiedTimingUpdated();
+ if (aEffect) {
+ aEffect->NotifySpecifiedTimingUpdated();
}
}
@@ -36,7 +36,7 @@ AnimationEffectTiming::SetEndDelay(double aEndDelay)
}
mTiming.mEndDelay = endDelay;
- NotifyTimingUpdate();
+ PostSpecifiedTimingUpdated(mEffect);
}
void
@@ -54,7 +54,7 @@ AnimationEffectTiming::SetIterationStart(double aIterationStart,
mTiming.mIterationStart = aIterationStart;
- NotifyTimingUpdate();
+ PostSpecifiedTimingUpdated(mEffect);
}
void
@@ -73,7 +73,7 @@ AnimationEffectTiming::SetDuration(const UnrestrictedDoubleOrString& aDuration,
mTiming.mDuration = newDuration;
- NotifyTimingUpdate();
+ PostSpecifiedTimingUpdated(mEffect);
}
} // namespace dom
diff --git a/dom/animation/AnimationEffectTiming.h b/dom/animation/AnimationEffectTiming.h
index a5720c570a..82e98c1dda 100644
--- a/dom/animation/AnimationEffectTiming.h
+++ b/dom/animation/AnimationEffectTiming.h
@@ -30,7 +30,6 @@ public:
ErrorResult& aRv);
private:
- void NotifyTimingUpdate();
KeyframeEffect* MOZ_NON_OWNING_REF mEffect;
};
diff --git a/dom/apps/AppsService.js b/dom/apps/AppsService.js
index 1fd05fe33a..a8fbfe368f 100644
--- a/dom/apps/AppsService.js
+++ b/dom/apps/AppsService.js
@@ -34,13 +34,24 @@ function AppsService()
AppsService.prototype = {
+ isInvalidId: function(localId) {
+ return (localId == Ci.nsIScriptSecurityManager.NO_APP_ID ||
+ localId == Ci.nsIScriptSecurityManager.UNKNOWN_APP_ID);
+ },
+
getManifestCSPByLocalId: function getCSPByLocalId(localId) {
debug("GetManifestCSPByLocalId( " + localId + " )");
+ if (this.isInvalidId(localId)) {
+ return null;
+ }
return DOMApplicationRegistry.getManifestCSPByLocalId(localId);
},
getDefaultCSPByLocalId: function getCSPByLocalId(localId) {
debug("GetDefaultCSPByLocalId( " + localId + " )");
+ if (this.isInvalidId(localId)) {
+ return null;
+ }
return DOMApplicationRegistry.getDefaultCSPByLocalId(localId);
},
@@ -71,11 +82,17 @@ AppsService.prototype = {
getAppByLocalId: function getAppByLocalId(aLocalId) {
debug("getAppByLocalId( " + aLocalId + " )");
+ if (this.isInvalidId(aLocalId)) {
+ return null;
+ }
return DOMApplicationRegistry.getAppByLocalId(aLocalId);
},
getManifestURLByLocalId: function getManifestURLByLocalId(aLocalId) {
debug("getManifestURLByLocalId( " + aLocalId + " )");
+ if (this.isInvalidId(aLocalId)) {
+ return null;
+ }
return DOMApplicationRegistry.getManifestURLByLocalId(aLocalId);
},
@@ -100,8 +117,7 @@ AppsService.prototype = {
getRedirect: function getRedirect(aLocalId, aURI) {
debug("getRedirect for " + aLocalId + " " + aURI.spec);
- if (aLocalId == Ci.nsIScriptSecurityManager.NO_APP_ID ||
- aLocalId == Ci.nsIScriptSecurityManager.UNKNOWN_APP_ID) {
+ if (this.isInvalidId(aLocalId)) {
return null;
}
diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp
index 285ad28e34..34d0a1e373 100644
--- a/dom/base/ChromeUtils.cpp
+++ b/dom/base/ChromeUtils.cpp
@@ -50,7 +50,7 @@ ThreadSafeChromeUtils::NondeterministicGetWeakSetKeys(GlobalObject& aGlobal,
}
}
- /* static */ void
+/* static */ void
ChromeUtils::OriginAttributesToSuffix(dom::GlobalObject& aGlobal,
const dom::OriginAttributesDictionary& aAttrs,
nsCString& aSuffix)
@@ -71,11 +71,17 @@ ChromeUtils::OriginAttributesMatchPattern(dom::GlobalObject& aGlobal,
}
/* static */ void
-ChromeUtils::CreateOriginAttributesWithUserContextId(dom::GlobalObject& aGlobal,
- const nsAString& aOrigin,
- uint32_t aUserContextId,
- dom::OriginAttributesDictionary& aAttrs,
- ErrorResult& aRv)
+ChromeUtils::CreateDefaultOriginAttributes(dom::GlobalObject& aGlobal,
+ dom::OriginAttributesDictionary& aAttrs)
+{
+ aAttrs = OriginAttributes();
+}
+
+/* static */ void
+ChromeUtils::CreateOriginAttributesFromOrigin(dom::GlobalObject& aGlobal,
+ const nsAString& aOrigin,
+ dom::OriginAttributesDictionary& aAttrs,
+ ErrorResult& aRv)
{
OriginAttributes attrs;
nsAutoCString suffix;
@@ -83,10 +89,16 @@ ChromeUtils::CreateOriginAttributesWithUserContextId(dom::GlobalObject& aGlobal,
aRv.Throw(NS_ERROR_FAILURE);
return;
}
-
- attrs.mUserContextId = aUserContextId;
aAttrs = attrs;
}
+/* static */ void
+ChromeUtils::CreateOriginAttributesFromDict(dom::GlobalObject& aGlobal,
+ const dom::OriginAttributesDictionary& aAttrs,
+ dom::OriginAttributesDictionary& aNewAttrs)
+{
+ aNewAttrs = aAttrs;
+}
+
} // namespace dom
} // namespace mozilla
diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h
index 8b29fa804f..cf1f30a402 100644
--- a/dom/base/ChromeUtils.h
+++ b/dom/base/ChromeUtils.h
@@ -59,11 +59,19 @@ public:
const dom::OriginAttributesPatternDictionary& aPattern);
static void
- CreateOriginAttributesWithUserContextId(dom::GlobalObject& aGlobal,
- const nsAString& aOrigin,
- uint32_t aUserContextId,
- dom::OriginAttributesDictionary& aAttrs,
- ErrorResult& aRv);
+ CreateDefaultOriginAttributes(dom::GlobalObject& aGlobal,
+ dom::OriginAttributesDictionary& aAttrs);
+
+ static void
+ CreateOriginAttributesFromOrigin(dom::GlobalObject& aGlobal,
+ const nsAString& aOrigin,
+ dom::OriginAttributesDictionary& aAttrs,
+ ErrorResult& aRv);
+
+ static void
+ CreateOriginAttributesFromDict(dom::GlobalObject& aGlobal,
+ const dom::OriginAttributesDictionary& aAttrs,
+ dom::OriginAttributesDictionary& aNewAttrs);
};
} // namespace dom
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 230a204409..0391223e16 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -1426,6 +1426,8 @@ nsIDocument::nsIDocument()
: nsINode(nullNodeInfo),
mReferrerPolicySet(false),
mReferrerPolicy(mozilla::net::RP_Default),
+ mBlockAllMixedContent(false),
+ mBlockAllMixedContentPreloads(false),
mUpgradeInsecureRequests(false),
mUpgradeInsecurePreloads(false),
mCharacterSet(NS_LITERAL_CSTRING("ISO-8859-1")),
@@ -2581,13 +2583,18 @@ nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
nsCOMPtr sameTypeParent;
treeItem->GetSameTypeParent(getter_AddRefs(sameTypeParent));
if (sameTypeParent) {
- mUpgradeInsecureRequests =
- sameTypeParent->GetDocument()->GetUpgradeInsecureRequests(false);
+ nsIDocument* doc = sameTypeParent->GetDocument();
+ mBlockAllMixedContent = doc->GetBlockAllMixedContent(false);
+ // if the parent document makes use of block-all-mixed-content
+ // then subdocument preloads should always be blocked.
+ mBlockAllMixedContentPreloads =
+ mBlockAllMixedContent || doc->GetBlockAllMixedContent(true);
+
+ mUpgradeInsecureRequests = doc->GetUpgradeInsecureRequests(false);
// if the parent document makes use of upgrade-insecure-requests
// then subdocument preloads should always be upgraded.
mUpgradeInsecurePreloads =
- mUpgradeInsecureRequests ||
- sameTypeParent->GetDocument()->GetUpgradeInsecureRequests(true);
+ mUpgradeInsecureRequests || doc->GetUpgradeInsecureRequests(true);
}
}
@@ -2686,6 +2693,16 @@ nsDocument::ApplySettingsFromCSP(bool aSpeculative)
mReferrerPolicy = static_cast(referrerPolicy);
mReferrerPolicySet = true;
}
+
+ // Set up 'block-all-mixed-content' if not already inherited
+ // from the parent context or set by any other CSP.
+ if (!mBlockAllMixedContent) {
+ rv = csp->GetBlockAllMixedContent(&mBlockAllMixedContent);
+ NS_ENSURE_SUCCESS_VOID(rv);
+ }
+ if (!mBlockAllMixedContentPreloads) {
+ mBlockAllMixedContentPreloads = mBlockAllMixedContent;
+ }
// Set up 'upgrade-insecure-requests' if not already inherited
// from the parent context or set by any other CSP.
@@ -2701,12 +2718,17 @@ nsDocument::ApplySettingsFromCSP(bool aSpeculative)
}
// 2) apply settings from speculative csp
- if (!mUpgradeInsecurePreloads) {
- nsCOMPtr preloadCsp;
- rv = NodePrincipal()->GetPreloadCsp(getter_AddRefs(preloadCsp));
- NS_ENSURE_SUCCESS_VOID(rv);
- if (preloadCsp) {
- preloadCsp->GetUpgradeInsecureRequests(&mUpgradeInsecurePreloads);
+ nsCOMPtr preloadCsp;
+ rv = NodePrincipal()->GetPreloadCsp(getter_AddRefs(preloadCsp));
+ NS_ENSURE_SUCCESS_VOID(rv);
+ if (preloadCsp) {
+ if (!mBlockAllMixedContentPreloads) {
+ rv = preloadCsp->GetBlockAllMixedContent(&mBlockAllMixedContentPreloads);
+ NS_ENSURE_SUCCESS_VOID(rv);
+ }
+ if (!mUpgradeInsecurePreloads) {
+ rv = preloadCsp->GetUpgradeInsecureRequests(&mUpgradeInsecurePreloads);
+ NS_ENSURE_SUCCESS_VOID(rv);
}
}
}
diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index b53808047b..91ed89761d 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -326,6 +326,19 @@ public:
return GetReferrerPolicy();
}
+ /**
+ * If true, this flag indicates that all mixed content subresource
+ * loads for this document (and also embeded browsing contexts) will
+ * be blocked.
+ */
+ bool GetBlockAllMixedContent(bool aPreload) const
+ {
+ if (aPreload) {
+ return mBlockAllMixedContentPreloads;
+ }
+ return mBlockAllMixedContent;
+ }
+
/**
* If true, this flag indicates that all subresource loads for this
* document need to be upgraded from http to https.
@@ -2808,6 +2821,8 @@ protected:
bool mReferrerPolicySet;
ReferrerPolicyEnum mReferrerPolicy;
+ bool mBlockAllMixedContent;
+ bool mBlockAllMixedContentPreloads;
bool mUpgradeInsecureRequests;
bool mUpgradeInsecurePreloads;
diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini
index 8cb7ddb6bb..8dbaecd22a 100644
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -14,6 +14,7 @@ support-files =
[test_url.xul]
[test_console.xul]
[test_navigator_resolve_identity_xrays.xul]
+support-files = file_navigator_resolve_identity_xrays.xul
[test_sendQueryContentAndSelectionSetEvent.html]
[test_bug1016960.html]
[test_bug357450.js]
diff --git a/dom/base/test/file_navigator_resolve_identity_xrays.xul b/dom/base/test/file_navigator_resolve_identity_xrays.xul
new file mode 100644
index 0000000000..f89c51516a
--- /dev/null
+++ b/dom/base/test/file_navigator_resolve_identity_xrays.xul
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dom/base/test/test_navigator_resolve_identity.html b/dom/base/test/test_navigator_resolve_identity.html
index 882853525a..024bd5f2ad 100644
--- a/dom/base/test/test_navigator_resolve_identity.html
+++ b/dom/base/test/test_navigator_resolve_identity.html
@@ -12,12 +12,29 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=985827
/** Test for Bug 985827 **/
- // Test WebIDL NavigatorProperty objects
- var x = navigator.mozContacts;
- is(typeof x, "object", "Should have a mozContacts object");
- delete navigator.mozContacts;
- var y = navigator.mozContacts;
- is(x, y, "Should have gotten the same mozContacts object again");
+ function test() {
+ var is = parent.is;
+
+ // Test WebIDL NavigatorProperty objects
+ var x = navigator.mozContacts;
+ is(typeof x, "object", "Should have a mozContacts object");
+ delete navigator.mozContacts;
+ var y = navigator.mozContacts;
+ is(x, y, "Should have gotten the same mozContacts object again");
+ }
+
+ SimpleTest.waitForExplicitFinish();
+
+ SpecialPowers.pushPermissions([
+ {type: "contacts-read", allow: true, context: document},
+ {type: "contacts-write", allow: true, context: document},
+ {type: "contacts-create", allow: true, context: document},
+ ], function() {
+ var iframe = document.createElement("iframe");
+ iframe.src = "data:text/html,
diff --git a/dom/base/test/test_navigator_resolve_identity_xrays.xul b/dom/base/test/test_navigator_resolve_identity_xrays.xul
index 41ff4591b4..183bd74c5f 100644
--- a/dom/base/test/test_navigator_resolve_identity_xrays.xul
+++ b/dom/base/test/test_navigator_resolve_identity_xrays.xul
@@ -9,12 +9,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=985827
-
-
Mozilla Bug 985827
+
@@ -23,17 +22,37 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=985827
/** Test for Bug 985827 **/
SimpleTest.waitForExplicitFinish();
+
+ Components.utils.import("resource://gre/modules/Services.jsm");
+
addLoadEvent(function() {
- var nav = $("t").contentWindow.navigator;
- ok(Components.utils.isXrayWrapper(nav), "Should have an Xray here");
+ var iframe = document.getElementById("t");
- // Test WebIDL NavigatorProperty objects
- is(typeof nav.mozContacts, "object", "Should have a mozContacts object");
- is(nav.mozContacts, nav.mozContacts,
- "Should have gotten the same mozContacts object again");
+ Services.perms.addFromPrincipal(iframe.contentDocument.nodePrincipal,
+ "contacts-read",
+ Services.perms.ALLOW_ACTION);
+ Services.perms.addFromPrincipal(iframe.contentDocument.nodePrincipal,
+ "contacts-write",
+ Services.perms.ALLOW_ACTION);
+ Services.perms.addFromPrincipal(iframe.contentDocument.nodePrincipal,
+ "contacts-create",
+ Services.perms.ALLOW_ACTION);
- SimpleTest.finish();
+ var dir = "chrome://mochitests/content/chrome/dom/base/test/";
+ iframe.src = dir + "file_navigator_resolve_identity_xrays.xul";
+ iframe.onload = function() { finish(); };
+
+ function finish() {
+ Services.perms.removeFromPrincipal(document.nodePrincipal,
+ "contacts-read");
+ Services.perms.removeFromPrincipal(document.nodePrincipal,
+ "contacts-write");
+ Services.perms.removeFromPrincipal(document.nodePrincipal,
+ "contacts-create");
+ SimpleTest.finish();
+ }
});
+
]]>
diff --git a/dom/bindings/test/file_bug707564-2.html b/dom/bindings/test/file_bug707564-2.html
new file mode 100644
index 0000000000..7db42e941a
--- /dev/null
+++ b/dom/bindings/test/file_bug707564-2.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+ Test for Bug 707564
+
+
+
+
+
+Mozilla Bug 707564
+
+
+
+
+
+
+
+
+
diff --git a/dom/bindings/test/mochitest.ini b/dom/bindings/test/mochitest.ini
index a3dc8ac954..a83eeebe08 100644
--- a/dom/bindings/test/mochitest.ini
+++ b/dom/bindings/test/mochitest.ini
@@ -2,6 +2,7 @@
support-files =
file_InstanceOf.html
file_bug707564.html
+ file_bug707564-2.html
file_bug775543.html
file_document_location_set_via_xray.html
file_dom_xrays.html
diff --git a/dom/bindings/test/test_bug707564-chrome.html b/dom/bindings/test/test_bug707564-chrome.html
index 7e3185a2a9..bbd4b0f2fa 100644
--- a/dom/bindings/test/test_bug707564-chrome.html
+++ b/dom/bindings/test/test_bug707564-chrome.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=707564
-
+