Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 23:30:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 980023 - Localstorage access with nsEp. r=bholley

Browse Source
This commit is contained in:
Gabor Krizsanits 2014-03-11 08:41:55 +01:00
parent 534c6469a6
commit fb3e4c0034
3 changed files with 42 additions and 6 deletions

9
extensions/cookie/nsPermissionManager.cpp

@ -1109,6 +1109,9 @@ nsPermissionManager::CommonTestPermission(nsIPrincipal* aPrincipal,
return NS_OK;
}
// Set the default.
*aPermission = nsIPermissionManager::UNKNOWN_ACTION;
// For expanded principals, we want to iterate over the whitelist and see
// if the permission is granted for any of them.
nsCOMPtr<nsIExpandedPrincipal> ep = do_QueryInterface(aPrincipal);
@ -1117,9 +1120,6 @@ nsPermissionManager::CommonTestPermission(nsIPrincipal* aPrincipal,
nsresult rv = ep->GetWhiteList(&whitelist);
NS_ENSURE_SUCCESS(rv, rv);
// Start with DENY_ACTION. If we get PROMPT_ACTION, keep going to see if
// we get ALLOW_ACTION from another principal.
*aPermission = nsIPermissionManager::DENY_ACTION;
for (size_t i = 0; i < whitelist->Length(); ++i) {
uint32_t perm;
rv = CommonTestPermission(whitelist->ElementAt(i), aType, &perm, aExactHostMatch,
@ -1137,9 +1137,6 @@ nsPermissionManager::CommonTestPermission(nsIPrincipal* aPrincipal,
return NS_OK;
}
// set the default
*aPermission = nsIPermissionManager::UNKNOWN_ACTION;
nsAutoCString host;
nsresult rv = GetHostForPrincipal(aPrincipal, host);
NS_ENSURE_SUCCESS(rv, rv);

1
js/xpconnect/tests/chrome/chrome.ini

@ -63,6 +63,7 @@ support-files =
[test_expandosharing.xul]
[test_exposeInDerived.xul]
[test_getweakmapkeys.xul]
[test_localstorage_with_nsEp.xul]
[test_mozMatchesSelector.xul]
[test_nodelists.xul]
[test_paris_weakmap_keys.xul]

38
js/xpconnect/tests/chrome/test_localstorage_with_nsEp.xul Normal file

@ -0,0 +1,38 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=980023
-->
<window title="Mozilla Bug 980023 "
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml">
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=980023"
target="_blank">Mozilla Bug 980023 </a>
</body>
<!-- test code goes here -->
<script type="application/javascript">
<![CDATA[
/** Test for localstorage access with expanded principal. **/
SimpleTest.waitForExplicitFinish();
const Cu = Components.utils;
function go() {
var iwin = document.getElementById('ifr').contentWindow;
var sb = new Cu.Sandbox([iwin], {sandboxPrototype: iwin});
Cu.evalInSandbox("window.localStorage.test_localstorage_with_nsEp = 3",sb);
is(Cu.evalInSandbox("window.localStorage.test_localstorage_with_nsEp",sb), 3);
is(iwin.localStorage.test_localstorage_with_nsEp, 3);
iwin.localStorage.removeItem("test_localstorage_with_nsEp");
SimpleTest.finish();
}
]]>
</script>
<iframe id="ifr" onload="go();" src="http://example.org/tests/js/xpconnect/tests/mochitest/file_empty.html" />
</window>