From 84fe4da16a1dd352bbdbbd66bd4e6444888f7f91 Mon Sep 17 00:00:00 2001 From: "bzbarsky@mit.edu" Date: Thu, 5 Apr 2007 15:49:32 -0700 Subject: [PATCH] Default javascript: URIs to running in a sandbox instead of not running atall. Bug 376484, r+sr=jst --- dom/public/nsIScriptChannel.idl | 2 +- dom/src/jsurl/nsJSProtocolHandler.cpp | 2 +- layout/reftests/bugs/376484-1-ref.html | 10 ++++++++++ layout/reftests/bugs/376484-1.html | 19 +++++++++++++++++++ layout/reftests/bugs/reftest.list | 1 + 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 layout/reftests/bugs/376484-1-ref.html create mode 100644 layout/reftests/bugs/376484-1.html diff --git a/dom/public/nsIScriptChannel.idl b/dom/public/nsIScriptChannel.idl index 01da8d56adde..f4c73f97afae 100644 --- a/dom/public/nsIScriptChannel.idl +++ b/dom/public/nsIScriptChannel.idl @@ -80,7 +80,7 @@ interface nsIScriptChannel : nsISupports /** * Whether and how the program represented by this channel is to be executed. * The default value if this property has never been set on this channel MUST - * be NO_EXECUTION. + * be either EXECUTE_IN_SANDBOX or NO_EXECUTION. * * @throws NS_ERROR_INVALID_ARG when set to an unrecognized value. */ diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp index 4a1c06f32ab3..95686cd766d3 100644 --- a/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -435,7 +435,7 @@ nsJSChannel::nsJSChannel() : mLoadFlags(LOAD_NORMAL), mActualLoadFlags(LOAD_NORMAL), mPopupState(openOverridden), - mExecutionPolicy(NO_EXECUTION), + mExecutionPolicy(EXECUTE_IN_SANDBOX), mIsActive(PR_FALSE), mOpenedStreamChannel(PR_FALSE) { diff --git a/layout/reftests/bugs/376484-1-ref.html b/layout/reftests/bugs/376484-1-ref.html new file mode 100644 index 000000000000..5bc00deb06ac --- /dev/null +++ b/layout/reftests/bugs/376484-1-ref.html @@ -0,0 +1,10 @@ + + + +

This is text

+

This is more text

+

This is yet more text

+

This is even more text

+ + + diff --git a/layout/reftests/bugs/376484-1.html b/layout/reftests/bugs/376484-1.html new file mode 100644 index 000000000000..3f3ced3c4ba4 --- /dev/null +++ b/layout/reftests/bugs/376484-1.html @@ -0,0 +1,19 @@ + + + + + + + + +

This is text

+

This is more text

+

This is yet more text

+

This is even more text

+ + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 1e0f12d83c8f..10b30877a534 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -206,3 +206,4 @@ fails == 368504-1.html 368504-1-ref.html # bug 368504 == 372062-1.html 372062-1-ref.html == 374038-1.xul 374038-1-ref.xul == 374038-2.xul 374038-2-ref.xul +== 376484-1.html 376484-1-ref.html