Changeset 126168 in webkit

Timestamp:

Aug 21, 2012 10:03:12 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: do not use window's eval in InjectedScript
​https://bugs.webkit.org/show_bug.cgi?id=94610

Reviewed by Yury Semikhatsky.

Source/WebCore:

Otherwise, inspector does not work when eval is overriden.

Test: inspector/console/console-eval-fake.html

• bindings/js/JSInjectedScriptHostCustom.cpp:

(WebCore::JSInjectedScriptHost::evaluate):
(WebCore):

• bindings/v8/custom/V8InjectedScriptHostCustom.cpp:

(WebCore::V8InjectedScriptHost::evaluateCallback):
(WebCore):

• inspector/InjectedScriptHost.idl:
• inspector/InjectedScriptSource.js:

(.):

LayoutTests:

• inspector/console/console-eval-fake-expected.txt: Added.
• inspector/console/console-eval-fake.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/console-eval-fake-expected.txt (added)
• LayoutTests/inspector/console/console-eval-fake.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptHost.idl (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-21  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: do not use window's eval in InjectedScript
+        https://bugs.webkit.org/show_bug.cgi?id=94610
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/console/console-eval-fake-expected.txt: Added.
+        * inspector/console/console-eval-fake.html: Added.
+
 2012-08-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-21  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: do not use window's eval in InjectedScript
+        https://bugs.webkit.org/show_bug.cgi?id=94610
+
+        Reviewed by Yury Semikhatsky.
+
+        Otherwise, inspector does not work when eval is overriden.
+
+        Test: inspector/console/console-eval-fake.html
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::evaluate):
+        (WebCore):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::evaluateCallback):
+        (WebCore):
+        * inspector/InjectedScriptHost.idl:
+        * inspector/InjectedScriptSource.js:
+        (.):
+
 2012-08-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -276 +276 @@
 }
 
+JSValue JSInjectedScriptHost::evaluate(ExecState* exec)
+{
+    JSValue expression = exec->argument(0);
+    if (!expression.isString())
+        return throwError(exec, createError(exec, "String argument expected."));
+    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
+    JSFunction* evalFunction = globalObject->evalFunction();
+    CallData callData;
+    CallType callType = evalFunction->methodTable()->getCallData(evalFunction, callData);
+    if (callType == CallTypeNone)
+        return jsUndefined();
+    MarkedArgumentBuffer args;
+    args.append(expression);
+
+    bool wasEvalEnabled = globalObject->evalEnabled();
+    globalObject->setEvalEnabled(true);
+    JSValue result = JSC::call(exec, evalFunction, callType, callData, exec->globalThisValue(), args);
+    globalObject->setEvalEnabled(wasEvalEnabled);
+
+    return result;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

@@ -300 +300 @@
 }
 
+v8::Handle<v8::Value> V8InjectedScriptHost::evaluateCallback(const v8::Arguments& args)
+{
+    INC_STATS("InjectedScriptHost.evaluate()");
+    if (args.Length() < 1)
+        return v8::ThrowException(v8::Exception::Error(v8::String::New("One argument expected.")));
+
+    v8::Handle<v8::String> expression = args[0]->ToString();
+    if (expression.IsEmpty())
+        return v8::ThrowException(v8::Exception::Error(v8::String::New("The argument must be a string.")));
+
+    v8::Handle<v8::Script> script = v8::Script::Compile(expression);
+    if (script.IsEmpty()) // Return immediately in case of exception to let the caller handle it.
+        return v8::Handle<v8::Value>();
+    return script->Run();
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InjectedScriptHost.idl

@@ -48 +48 @@
         [Custom] DOMString databaseId(in DOMObject database);
         [Custom] DOMString storageId(in DOMObject storage);
+        [Custom] DOMObject evaluate(in DOMString text);
     };
 }

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -175 +175 @@
     _parseObjectId: function(objectId)
     {
-        return eval("(" + objectId + ")");
+        return InjectedScriptHost.evaluate("(" + objectId + ")");
     },
 
@@ -198 +198 @@
     dispatch: function(methodName, args)
     {
-        var argsArray = eval("(" + args + ")");
+        var argsArray = InjectedScriptHost.evaluate("(" + args + ")");
         var result = this[methodName].apply(this, argsArray);
         if (typeof result === "undefined") {
@@ -343 +343 @@
     evaluate: function(expression, objectGroup, injectCommandLineAPI, returnByValue)
     {
-        return this._evaluateAndWrap(inspectedWindow.eval, inspectedWindow, expression, objectGroup, false, injectCommandLineAPI, returnByValue);
+        return this._evaluateAndWrap(InjectedScriptHost.evaluate, InjectedScriptHost, expression, objectGroup, false, injectCommandLineAPI, returnByValue);
     },
 
@@ -361 +361 @@
         if (args) {
             var resolvedArgs = [];
-            args = eval(args);
+            args = InjectedScriptHost.evaluate(args);
             for (var i = 0; i < args.length; ++i) {
                 objectId = args[i].objectId;
@@ -383 +383 @@
         try {
             var objectGroup = this._idToObjectGroupName[parsedObjectId.id];
-            var func = eval("(" + expression + ")");
+            var func = InjectedScriptHost.evaluate("(" + expression + ")");
             if (typeof func !== "function")
                 return "Given expression does not evaluate to a function";
@@ -516 +516 @@
     _callFrameForId: function(topCallFrame, callFrameId)
     {
-        var parsedCallFrameId = eval("(" + callFrameId + ")");
+        var parsedCallFrameId = InjectedScriptHost.evaluate("(" + callFrameId + ")");
         var ordinal = parsedCallFrameId["ordinal"];
         var callFrame = topCallFrame;
@@ -563 +563 @@
     {
         delete this._modules[name];
-        var module = eval("(" + source + ")");
+        var module = InjectedScriptHost.evaluate("(" + source + ")");
         this._modules[name] = module;
         return module;