Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 246699: report better errors (with stacks) for security denials. r+sr=jst, a=mconnor.

Browse Source
This commit is contained in:
shaver@mozilla.org 2008-03-20 01:19:15 -07:00
parent a70ab38708
commit ba5430c6e5
3 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
caps/src/nsScriptSecurityManager.cpp
View File

@ -149,18 +149,13 @@ GetScriptContext(JSContext *cx)
inline void SetPendingException(JSContext *cx, const char *aMsg) inline void SetPendingException(JSContext *cx, const char *aMsg)
{ {
JSAutoRequest ar(cx); JSAutoRequest ar(cx);
JSString *str = JS_NewStringCopyZ(cx, aMsg); JS_ReportError(cx, "%s", aMsg);
if (str)
JS_SetPendingException(cx, STRING_TO_JSVAL(str));
} }
inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg) inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg)
{ {
JSAutoRequest ar(cx); JSAutoRequest ar(cx);
JSString *str = JS_NewUCStringCopyZ(cx, JS_ReportError(cx, "%hs", aMsg);
reinterpret_cast<const jschar*>(aMsg));
if (str)
JS_SetPendingException(cx, STRING_TO_JSVAL(str));
} }
// DomainPolicy members // DomainPolicy members

1
caps/tests/mochitest/Makefile.in
View File

@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
_TEST_FILES = test_bug423375.html \ _TEST_FILES = test_bug423375.html \
test_bug246699.html \
$(NULL) $(NULL)
libs:: $(_TEST_FILES) libs:: $(_TEST_FILES)

61
caps/tests/mochitest/test_bug246699.html Normal file
View File

@ -0,0 +1,61 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=246699
-->
<head>
<title>Test for Bug 246699</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=246699">Mozilla Bug 246699</a>
<p id="display"></p>
<div id="content" style="display: none">
<iframe id="load-frame"></iframe>
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/**
** Test for Bug 246699
** (should produce stack information for caps errors)
**/
function hasStack(e)
{
return e instanceof Error && /inciteCaps/.test(e.stack);
}
function inciteCaps(f)
{
try {
f();
return "operation succeeded";
} catch (e if hasStack(e)) {
return "denied-stack";
} catch (e) {
return "unexpected: " + e;
}
}
function tryChromeLoad()
{
window.frames[0].location = "chrome://global/content/mozilla.xhtml";
}
function tryComponentsClasses()
{
return Components.classes["@mozilla.org/dummy;1"];
}
is(inciteCaps(tryChromeLoad), "denied-stack",
"should get stack for content-loading-chrome rejection");
is(inciteCaps(tryComponentsClasses), "denied-stack",
"should get stack for Components.classes rejection");
</script>
</pre>
</body>
</html>