Enforce ScriptForbiddenScope and make it non-fatal.

Source/bindings/core/v8/V8ScriptRunner.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 17 matching lines @@
 
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/ScriptStreamer.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8RecursionScope.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/CachedMetadata.h"
 #include "core/fetch/ScriptResource.h"
+#include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
 
 namespace blink {
 
 namespace {
 
 // In order to make sure all pending messages to be processed in
 // v8::Function::Call, we don't call handleMaxRecursionDepthExceeded
 // directly. Instead, we create a v8::Function of
 // throwStackOverflowException and call it.
@@ skipping 120 matching lines @@
     TRACE_EVENT1("v8", "v8.run", "fileName", TRACE_STR_COPY(*v8::String::Utf8Value(script->GetUnboundScript()->GetScriptName())));
 
     if (V8RecursionScope::recursionLevel(isolate) >= kMaxRecursionDepth)
         return throwStackOverflowExceptionIfNeeded(isolate);
 
     RELEASE_ASSERT(!context->isIteratingOverObservers());
 
     // Run the script and keep track of the current recursion depth.
     v8::Local<v8::Value> result;
     {
+        if (ScriptForbiddenScope::isScriptForbidden())
+            return v8::Undefined(isolate);

[haraken, 2014/10/14 05:55:29]

v8::Undefined(isolate) => return v8::Local<v8::Value>()

[dcheng, 2014/10/14 06:42:08]

Done.

         V8RecursionScope recursionScope(isolate);
         result = script->Run();
     }
 
     if (result.IsEmpty())
         return v8::Local<v8::Value>();
 
     crashIfV8IsDead();
     return result;
 }
@@ skipping 25 matching lines @@
 v8::Local<v8::Value> V8ScriptRunner::callFunction(v8::Handle<v8::Function> function, ExecutionContext* context, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> args[], v8::Isolate* isolate)
 {
     TRACE_EVENT0("v8", "v8.callFunction");
     TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Execution");
 
     if (V8RecursionScope::recursionLevel(isolate) >= kMaxRecursionDepth)
         return throwStackOverflowExceptionIfNeeded(isolate);
 
     RELEASE_ASSERT(!context->isIteratingOverObservers());
 
+    if (ScriptForbiddenScope::isScriptForbidden())
+        return v8::Undefined(isolate);

[haraken, 2014/10/14 05:55:29]

v8::Undefined(isolate) => return v8::Local<v8::Value>()

[dcheng, 2014/10/14 06:42:08]

Done.

     V8RecursionScope recursionScope(isolate);
     v8::Local<v8::Value> result = function->Call(receiver, argc, args);
     crashIfV8IsDead();
     return result;
 }
 
 v8::Local<v8::Value> V8ScriptRunner::callInternalFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Value> receiver, int argc, v8::Handle<v8::Value> args[], v8::Isolate* isolate)
 {
     TRACE_EVENT0("v8", "v8.callFunction");
     TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Execution");
@@ skipping 33 matching lines @@
     V8RecursionScope::MicrotaskSuppression scope(isolate);
     v8::Local<v8::Object> result = function->NewInstance(argc, argv);
     crashIfV8IsDead();
     return result;
 }
 
 v8::Local<v8::Object> V8ScriptRunner::instantiateObjectInDocument(v8::Isolate* isolate, v8::Handle<v8::Function> function, ExecutionContext* context, int argc, v8::Handle<v8::Value> argv[])
 {
     TRACE_EVENT0("v8", "v8.newInstance");
     TRACE_EVENT_SCOPED_SAMPLING_STATE("v8", "V8Execution");
+    if (ScriptForbiddenScope::isScriptForbidden())
+        return v8::Local<v8::Object>();
     V8RecursionScope scope(isolate);
     v8::Local<v8::Object> result = function->NewInstance(argc, argv);
     crashIfV8IsDead();
     return result;
 }
 
 unsigned V8ScriptRunner::tagForParserCache()
 {
     return StringHash::hash(v8::V8::GetVersion()) * 2;
 }
 
 unsigned V8ScriptRunner::tagForCodeCache()
 {
     return StringHash::hash(v8::V8::GetVersion()) * 2 + 1;
 }
 
 } // namespace blink