mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
ee118c4b83
- Bug 1051146 - Part 1: Introduce the B2G specific build flags, initially enabled. r=smaug (341c7565d) - Bug 1051146 - art 2: Introduce the new Pocketsphinx and Sphinxbase code with no build integration. r=smaug, r=gerv (f29eafa78) - Bug 1051146 - Part 3: Introduce build system changes for the new Pocketsphinx and Sphinxbase code. r=smaug, r=gps (06c60429d) - Bug 1051146 - Part 4: Introduce build system changes for the MOZ_WEBSPEECH_TEST_BACKEND flag. r=smaug, r=gps (16195e66e) - Bug 1051146 - Part 5: Introduce new English model with no build integration. r=smaug (24996aa9c) - Bug 1051146 - Part 6: Introduce build integration of new English model. r=smaug, r=gps (b718751a9) - Bug 1051146 - Part 7: Introduce update scripts for Pocketsphinx and Sphinxbase code. r=smaug (5a85c7ed2) - Bug 1051148 - Part 1: Patch that introduces WebSpeech API implementation. r=smaug (d18e5d86e) - Bug 1171249 - Modified configure.in so MOZ_WEBSPEECH undefined implies both MOZ_WEBSPEECH_TEST_BACKEND and MOZ_WEBSPEECH_MODELS are undefined. r=gps (47d13fc61) - Bug 1051148 - Part 2: Patch that turns off the WebSpeech API implementation using flags. r=gps (8b2ceef89) - Bug 1051146 - Disable Pocketsphinx building on Windows due to bustage. r=gps (48f4a1c27) - Bug 1204703 - Make nsContentSecurityManager scriptable (r=sicking) (fb514951a) - Bug 1215745: Safer implemetation of nsJarChannel::AsyncOpen2. r=ckerschb (3ad0270b4) - partial of Bug 1178892 - Split the profiler into Core & Gecko files and break apart monolithic headers. r=mstange (eda571469) - Bug 1213407 - PluginModuleContentParent should delete its Transport. r=billm (153a54404) - Bug 1169945 - Remove unused plugins.enumerable_names whitelist. r=bsmedberg (52126cbd8) - Bug 1160166 - Disabled plugin meta information often isn't available to content processes. r=jimm (d63331192) - Bug 1165981 - Only allow flash as a plugin on Windows 64-bit builds; r=bsmedberg (bfc073186) - missing bit of 1164543 (5ef55bc55) - Bug 1178963 part 1. Use nsIPluginTagInternal instead of nsPluginTag in cases where it may be nsFakePluginTag. r=peterv (f8702aead) - Bug 1200484 (part 1) - Expose the column number in JS::DescribeScriptedCaller(). r=luke. (85cf65a1c) - Bug 1200484 (part 2) - Use JS column numbers in ReportWrapperDenial(). r=mrbkap. (1de0e6331) - Bug 1200484 (part 3) - Use JS column numbers in WebSocket.cpp. r=baku. (3febdd8bc) - Bug 1200484 (part 4) - Expose the column number in nsJSUtils::GetCallingLocation(). r=mrbkap. (479ae5e2a) - Bug 1200484 (part 5) - Use JS column numbers in XPCNativeInterface::NewInstance(). r=mrbkap. (63e5e4e41) - Bug 1200484 (part 6) - Use JS column numbers in ContentParent::OnChannelError(). r=billm. (4c84ef09d) - Bug 1139718 - Warning when sending MM messages that include XPCOM data (r=smaug) (d50774823) - Bug 1200484 (part 7) - Use JS column numbers in GetParamsForMessage() (bf19fc4cb) - Bug 1200484 (part 8) - Use JS column numbers in EventSource. r=khuey. (64374ed83) - Bug 1200484 (part 9) - Use JS column numbers in nsContentUtils::ReportToConsoleNonLocalized. r=khuey. (4d81c5f4f) - Bug 1200484 (part 10) - Use JS column numbers in indexedDB. r=khuey. (64eec5da6) - Bug 1200484 (part 11) - Set source location when initializing an nsJSScriptTimeoutHandler from a Function. r=peterv. (f135b3a2c) - Bug 1200484 (part 12) - Use JS column numbers in nsJSTimeoutHandler. r=peterv. (8ec21dc04) - Bug 1163664 - Don't check for plugin blocklist state on Android. r=jimm, r=jchen (14b8f3e57) - Bug 1178963 part 2. Implement nsFakePluginTag to represent a non-NPAPI "plugin" that is actually implemented in JavaScript. r=peterv (ba11d6de0) - Bug 1178896 - Add support for determining if a plugin is OOP to nsIPluginHost. r=aklotz (e8689641f) - Bug 1178963 part 3. Make nsPluginHost aware of fake plugins. r=peterv (a2a9f8cb3)
298 lines
9.2 KiB
C++
298 lines
9.2 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIDocument.h"
|
|
#include "nsIScriptTimeoutHandler.h"
|
|
#include "nsIXPConnect.h"
|
|
#include "nsJSUtils.h"
|
|
#include "nsContentUtils.h"
|
|
#include "nsError.h"
|
|
#include "nsGlobalWindow.h"
|
|
#include "nsIContentSecurityPolicy.h"
|
|
#include "mozilla/Attributes.h"
|
|
#include "mozilla/Likely.h"
|
|
#include <algorithm>
|
|
#include "mozilla/dom/FunctionBinding.h"
|
|
#include "nsAXPCNativeCallContext.h"
|
|
|
|
static const char kSetIntervalStr[] = "setInterval";
|
|
static const char kSetTimeoutStr[] = "setTimeout";
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
// Our JS nsIScriptTimeoutHandler implementation.
|
|
class nsJSScriptTimeoutHandler final : public nsIScriptTimeoutHandler
|
|
{
|
|
public:
|
|
// nsISupports
|
|
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
|
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsJSScriptTimeoutHandler)
|
|
|
|
nsJSScriptTimeoutHandler();
|
|
// This will call SwapElements on aArguments with an empty array.
|
|
nsJSScriptTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
|
|
Function& aFunction,
|
|
FallibleTArray<JS::Heap<JS::Value> >& aArguments,
|
|
ErrorResult& aError);
|
|
nsJSScriptTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression, bool* aAllowEval,
|
|
ErrorResult& aError);
|
|
|
|
virtual const char16_t* GetHandlerText() override;
|
|
virtual Function* GetCallback() override
|
|
{
|
|
return mFunction;
|
|
}
|
|
virtual void GetLocation(const char** aFileName, uint32_t* aLineNo,
|
|
uint32_t* aColumn) override
|
|
{
|
|
*aFileName = mFileName.get();
|
|
*aLineNo = mLineNo;
|
|
*aColumn = mColumn;
|
|
}
|
|
|
|
virtual const nsTArray<JS::Value>& GetArgs() override
|
|
{
|
|
return mArgs;
|
|
}
|
|
|
|
void ReleaseJSObjects();
|
|
|
|
private:
|
|
~nsJSScriptTimeoutHandler();
|
|
|
|
// filename, line number and JS language version string of the
|
|
// caller of setTimeout()
|
|
nsCString mFileName;
|
|
uint32_t mLineNo;
|
|
uint32_t mColumn;
|
|
nsTArray<JS::Heap<JS::Value> > mArgs;
|
|
|
|
// The expression to evaluate or function to call. If mFunction is non-null
|
|
// it should be used, else use mExpr.
|
|
nsString mExpr;
|
|
nsRefPtr<Function> mFunction;
|
|
};
|
|
|
|
|
|
// nsJSScriptTimeoutHandler
|
|
// QueryInterface implementation for nsJSScriptTimeoutHandler
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(nsJSScriptTimeoutHandler)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsJSScriptTimeoutHandler)
|
|
tmp->ReleaseJSObjects();
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsJSScriptTimeoutHandler)
|
|
if (MOZ_UNLIKELY(cb.WantDebugInfo())) {
|
|
nsAutoCString name("nsJSScriptTimeoutHandler");
|
|
if (tmp->mFunction) {
|
|
JSFunction* fun =
|
|
JS_GetObjectFunction(js::UncheckedUnwrap(tmp->mFunction->Callable()));
|
|
if (fun && JS_GetFunctionId(fun)) {
|
|
JSFlatString *funId = JS_ASSERT_STRING_IS_FLAT(JS_GetFunctionId(fun));
|
|
size_t size = 1 + JS_PutEscapedFlatString(nullptr, 0, funId, 0);
|
|
char *funIdName = new char[size];
|
|
if (funIdName) {
|
|
JS_PutEscapedFlatString(funIdName, size, funId, 0);
|
|
name.AppendLiteral(" [");
|
|
name.Append(funIdName);
|
|
delete[] funIdName;
|
|
name.Append(']');
|
|
}
|
|
}
|
|
} else {
|
|
name.AppendLiteral(" [");
|
|
name.Append(tmp->mFileName);
|
|
name.Append(':');
|
|
name.AppendInt(tmp->mLineNo);
|
|
name.Append(':');
|
|
name.AppendInt(tmp->mColumn);
|
|
name.Append(']');
|
|
}
|
|
cb.DescribeRefCountedNode(tmp->mRefCnt.get(), name.get());
|
|
}
|
|
else {
|
|
NS_IMPL_CYCLE_COLLECTION_DESCRIBE(nsJSScriptTimeoutHandler,
|
|
tmp->mRefCnt.get())
|
|
}
|
|
|
|
if (tmp->mFunction) {
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFunction)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
|
|
}
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsJSScriptTimeoutHandler)
|
|
for (uint32_t i = 0; i < tmp->mArgs.Length(); ++i) {
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_JSVAL_MEMBER_CALLBACK(mArgs[i])
|
|
}
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_END
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsJSScriptTimeoutHandler)
|
|
NS_INTERFACE_MAP_ENTRY(nsIScriptTimeoutHandler)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsJSScriptTimeoutHandler)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSScriptTimeoutHandler)
|
|
|
|
static bool
|
|
CheckCSPForEval(JSContext* aCx, nsGlobalWindow* aWindow, ErrorResult& aError)
|
|
{
|
|
// if CSP is enabled, and setTimeout/setInterval was called with a string,
|
|
// disable the registration and log an error
|
|
nsCOMPtr<nsIDocument> doc = aWindow->GetExtantDoc();
|
|
if (!doc) {
|
|
// if there's no document, we don't have to do anything.
|
|
return true;
|
|
}
|
|
|
|
nsCOMPtr<nsIContentSecurityPolicy> csp;
|
|
aError = doc->NodePrincipal()->GetCsp(getter_AddRefs(csp));
|
|
if (aError.Failed()) {
|
|
return false;
|
|
}
|
|
|
|
if (!csp) {
|
|
return true;
|
|
}
|
|
|
|
bool allowsEval = true;
|
|
bool reportViolation = false;
|
|
aError = csp->GetAllowsEval(&reportViolation, &allowsEval);
|
|
if (aError.Failed()) {
|
|
return false;
|
|
}
|
|
|
|
if (reportViolation) {
|
|
// TODO : need actual script sample in violation report.
|
|
NS_NAMED_LITERAL_STRING(scriptSample,
|
|
"call to eval() or related function blocked by CSP");
|
|
|
|
// Get the calling location.
|
|
uint32_t lineNum = 0;
|
|
nsAutoString fileNameString;
|
|
if (!nsJSUtils::GetCallingLocation(aCx, fileNameString, &lineNum)) {
|
|
fileNameString.AssignLiteral("unknown");
|
|
}
|
|
|
|
csp->LogViolationDetails(nsIContentSecurityPolicy::VIOLATION_TYPE_EVAL,
|
|
fileNameString, scriptSample, lineNum,
|
|
EmptyString(), EmptyString());
|
|
}
|
|
|
|
return allowsEval;
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler()
|
|
: mLineNo(0)
|
|
, mColumn(0)
|
|
{
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler(JSContext* aCx,
|
|
nsGlobalWindow *aWindow,
|
|
Function& aFunction,
|
|
FallibleTArray<JS::Heap<JS::Value> >& aArguments,
|
|
ErrorResult& aError)
|
|
: mLineNo(0)
|
|
, mColumn(0)
|
|
, mFunction(&aFunction)
|
|
{
|
|
if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
|
|
// This window was already closed, or never properly initialized,
|
|
// don't let a timer be scheduled on such a window.
|
|
aError.Throw(NS_ERROR_NOT_INITIALIZED);
|
|
return;
|
|
}
|
|
|
|
mozilla::HoldJSObjects(this);
|
|
mArgs.SwapElements(aArguments);
|
|
|
|
// Get the calling location.
|
|
nsJSUtils::GetCallingLocation(aCx, mFileName, &mLineNo, &mColumn);
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::nsJSScriptTimeoutHandler(JSContext* aCx,
|
|
nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression,
|
|
bool* aAllowEval,
|
|
ErrorResult& aError)
|
|
: mLineNo(0)
|
|
, mColumn(0)
|
|
, mExpr(aExpression)
|
|
{
|
|
if (!aWindow->GetContextInternal() || !aWindow->FastGetGlobalJSObject()) {
|
|
// This window was already closed, or never properly initialized,
|
|
// don't let a timer be scheduled on such a window.
|
|
aError.Throw(NS_ERROR_NOT_INITIALIZED);
|
|
return;
|
|
}
|
|
|
|
*aAllowEval = CheckCSPForEval(aCx, aWindow, aError);
|
|
if (aError.Failed() || !*aAllowEval) {
|
|
return;
|
|
}
|
|
|
|
// Get the calling location.
|
|
nsJSUtils::GetCallingLocation(aCx, mFileName, &mLineNo, &mColumn);
|
|
}
|
|
|
|
nsJSScriptTimeoutHandler::~nsJSScriptTimeoutHandler()
|
|
{
|
|
ReleaseJSObjects();
|
|
}
|
|
|
|
void
|
|
nsJSScriptTimeoutHandler::ReleaseJSObjects()
|
|
{
|
|
if (mFunction) {
|
|
mFunction = nullptr;
|
|
mArgs.Clear();
|
|
mozilla::DropJSObjects(this);
|
|
}
|
|
}
|
|
|
|
const char16_t *
|
|
nsJSScriptTimeoutHandler::GetHandlerText()
|
|
{
|
|
NS_ASSERTION(!mFunction, "No expression, so no handler text!");
|
|
return mExpr.get();
|
|
}
|
|
|
|
already_AddRefed<nsIScriptTimeoutHandler>
|
|
NS_CreateJSTimeoutHandler(JSContext *aCx, nsGlobalWindow *aWindow,
|
|
Function& aFunction,
|
|
const Sequence<JS::Value>& aArguments,
|
|
ErrorResult& aError)
|
|
{
|
|
FallibleTArray<JS::Heap<JS::Value> > args;
|
|
if (!args.AppendElements(aArguments, fallible)) {
|
|
aError.Throw(NS_ERROR_OUT_OF_MEMORY);
|
|
return nullptr;
|
|
}
|
|
|
|
nsRefPtr<nsJSScriptTimeoutHandler> handler =
|
|
new nsJSScriptTimeoutHandler(aCx, aWindow, aFunction, args, aError);
|
|
return aError.Failed() ? nullptr : handler.forget();
|
|
}
|
|
|
|
already_AddRefed<nsIScriptTimeoutHandler>
|
|
NS_CreateJSTimeoutHandler(JSContext* aCx, nsGlobalWindow *aWindow,
|
|
const nsAString& aExpression, ErrorResult& aError)
|
|
{
|
|
bool allowEval = false;
|
|
nsRefPtr<nsJSScriptTimeoutHandler> handler =
|
|
new nsJSScriptTimeoutHandler(aCx, aWindow, aExpression, &allowEval, aError);
|
|
if (aError.Failed() || !allowEval) {
|
|
return nullptr;
|
|
}
|
|
|
|
return handler.forget();
|
|
}
|