Changeset 83748 in webkit

Timestamp:

Apr 13, 2011 9:45:42 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-04-12 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: fix source mapping for deobfuscated scripts.
​https://bugs.webkit.org/show_bug.cgi?id=58231

• inspector/debugger/resources/obfuscated.js: Added.
• inspector/debugger/script-formatter-expected.txt:
• inspector/debugger/script-formatter.html:

2011-04-12 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: fix source mapping for de-obfuscated scripts.
​https://bugs.webkit.org/show_bug.cgi?id=58231

• inspector/front-end/ScriptFormatterWorker.js: (buildMapping):
• inspector/front-end/SourceFile.js: (WebInspector.SourceMapping): (WebInspector.SourceMapping.prototype.sourceLineToScriptLocation): (WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation): (WebInspector): (WebInspector.FormattedSourceMapping): (WebInspector.FormattedSourceMapping.prototype.scriptLocationToSourceLine): (WebInspector.FormattedSourceMapping.prototype.sourceLineToScriptLocation):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/resources/obfuscated.js (added)
• LayoutTests/inspector/debugger/script-formatter-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/script-formatter.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptFormatterWorker.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/SourceFile.js (modified) (5 diffs)
• Source/WebCore/inspector/front-end/SourceFrame.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-12  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: fix source mapping for deobfuscated scripts.
+        https://bugs.webkit.org/show_bug.cgi?id=58231
+
+        * inspector/debugger/resources/obfuscated.js: Added.
+        * inspector/debugger/script-formatter-expected.txt:
+        * inspector/debugger/script-formatter.html:
+
 2011-04-13  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/inspector/debugger/script-formatter-expected.txt

@@ -1 +1 @@
 Tests the script formatting functionality.
 
+Debugger was enabled.
 
 Running: testScriptFormatterWorker
 
+Running: testSourceMapping
+Debugger was disabled.
+

trunk/LayoutTests/inspector/debugger/script-formatter.html

@@ -3 +3 @@
 <script src="../../http/tests/inspector/inspector-test.js"></script>
 <script src="../../http/tests/inspector/debugger-test.js"></script>
+<script src="resources/obfuscated.js"></script>
 
 <script>
@@ -8 +9 @@
 var test = function()
 {
-    InspectorTest.runTestSuite([
+    var worker = new Worker("ScriptFormatterWorker.js");
+
+    InspectorTest.runDebuggerTestSuite([
         function testScriptFormatterWorker(next)
         {
-            var worker = new Worker("ScriptFormatterWorker.js");
-
             worker.onmessage = InspectorTest.safeWrap(function(event)
             {
                 InspectorTest.assertEquals("var x = 0;", event.data.formattedSource);
-                InspectorTest.completeTest();
+                next();
             });
 
@@ -22 +23 @@
             {
                 InspectorTest.addResult("Error in worker: " + event.data);
-                InspectorTest.completeTest();
+                next();
             };
 
             worker.postMessage("var x=0");
+        },
+
+        function testSourceMapping(next)
+        {
+            worker.onmessage = InspectorTest.safeWrap(function(event)
+            {
+                var source = WebInspector.panels.scripts.visibleView._content;
+                var formattedSource = event.data.formattedSource;
+                var mapping = event.data.mapping;
+
+                function testMapping(string)
+                {
+                    var position = source.indexOf(string);
+                    var formattedPosition = mapping.formatted[mapping.original.upperBound(position - 1)];
+                    InspectorTest.assertEquals(string, formattedSource.substr(formattedPosition, string.length));
+                }
+
+                testMapping("onmessage");
+                testMapping("indent_start");
+                testMapping("function require");
+                testMapping("var regexp");
+                testMapping("importScripts");
+
+                next();
+            });
+
+            worker.onerror = function(event)
+            {
+                InspectorTest.addResult("Error in worker: " + event.data);
+                next();
+            };
+
+            InspectorTest.showScriptSource("obfuscated.js", didShowScriptSource);
+
+            function didShowScriptSource(sourceFrame)
+            {
+                worker.postMessage(sourceFrame._content);
+            }
         }
     ]);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: fix source mapping for de-obfuscated scripts.
+        https://bugs.webkit.org/show_bug.cgi?id=58231
+
+        * inspector/front-end/ScriptFormatterWorker.js:
+        (buildMapping):
+        * inspector/front-end/SourceFile.js:
+        (WebInspector.SourceMapping):
+        (WebInspector.SourceMapping.prototype.sourceLineToScriptLocation):
+        (WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation):
+        (WebInspector):
+        (WebInspector.FormattedSourceMapping):
+        (WebInspector.FormattedSourceMapping.prototype.scriptLocationToSourceLine):
+        (WebInspector.FormattedSourceMapping.prototype.sourceLineToScriptLocation):
+
 2011-04-13  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/inspector/front-end/ScriptFormatterWorker.js

@@ -51 +51 @@
 {
     var mapping = { original: [], formatted: [] };
-    var lastFormattedPosition = 0;
-    var regexp = /\b(?:function|var|const|try|catch|throw|new|switch|break|continue|if|for|while|do|return|with|null|undefined)\b/g;
+    var lastPosition = 0;
+    var regexp = /(^|[^\\])\b((?=\D)[\$\.\w]+)\b/g;
     while (true) {
-        var match = regexp.exec(source);
+        var match = regexp.exec(formattedSource);
         if (!match)
             break;
-        var formattedPosition = formattedSource.indexOf(match[0], lastFormattedPosition);
-        mapping.original.push(match.index);
-        mapping.formatted.push(formattedPosition);
-        lastFormattedPosition = formattedPosition + match[0].length;
+        var position = source.indexOf(match[2], lastPosition);
+        if (position === -1)
+            throw "No match found in original source for " + match[2];
+        mapping.original.push(position);
+        mapping.formatted.push(match.index + match[1].length);
+        lastPosition = position + match[2].length;
     }
     return mapping;

trunk/Source/WebCore/inspector/front-end/SourceFile.js

@@ -264 +264 @@
 WebInspector.FormattedSourceFile.prototype.__proto__ = WebInspector.SourceFile.prototype;
 
-WebInspector.SourceMapping = function(sortedScripts)
+WebInspector.SourceMapping = function(scripts)
 {
-    this._sortedScripts = sortedScripts;
+    this._sortedScripts = scripts.slice();
+    this._sortedScripts.sort(function(x, y) { return x.lineOffset - y.lineOffset || x.columnOffset - y.columnOffset; });
 }
 
@@ -277 +278 @@
     sourceLineToScriptLocation: function(lineNumber)
     {
-        var columnNumber = 0;
+        return this._sourceLocationToScriptLocation(lineNumber, 0);
+    },
+
+    _sourceLocationToScriptLocation: function(lineNumber, columnNumber)
+    {
         var closestScript = this._sortedScripts[0];
         for (var i = 1; i < this._sortedScripts.length; ++i) {
@@ -289 +294 @@
 }
 
-WebInspector.FormattedSourceMapping = function(sortedScripts, originalText, formattedText, mapping)
+WebInspector.FormattedSourceMapping = function(scripts, originalText, formattedText, mapping)
 {
-    WebInspector.SourceMapping.call(this, sortedScripts);
+    WebInspector.SourceMapping.call(this, scripts);
     this._originalLineEndings = originalText.lineEndings();
     this._formattedLineEndings = formattedText.lineEndings();
@@ -301 +306 @@
     {
         var originalPosition = WebInspector.ScriptFormatter.locationToPosition(this._originalLineEndings, location);
-        var formattedPosition = this._convertPosition(this._mapping.original, this._mapping.formatted, originalPosition);
+        var index = this._mapping.original.upperBound(originalPosition - 1);
+        var formattedPosition = this._mapping.formatted[index];
         return WebInspector.ScriptFormatter.positionToLocation(this._formattedLineEndings, formattedPosition).lineNumber;
     },
@@ -308 +314 @@
     {
         var formattedPosition = WebInspector.ScriptFormatter.lineToPosition(this._formattedLineEndings, lineNumber);
-        var originalPosition = this._convertPosition(this._mapping.formatted, this._mapping.original, formattedPosition);
+        var index = this._mapping.formatted.upperBound(formattedPosition - 1);
+        var originalPosition = this._mapping.original[index];
         var originalLocation = WebInspector.ScriptFormatter.positionToLocation(this._originalLineEndings, originalPosition);
-        return WebInspector.SourceMapping.prototype.sourceLineToScriptLocation.call(this, originalLocation.lineNumber);
-    },
-
-    _convertPosition: function(positions1, positions2, position)
-    {
-        var index = positions1.upperBound(position);
-        var range1 = positions1[index] - positions1[index - 1];
-        var range2 = positions2[index] - positions2[index - 1];
-        var position2 = positions2[index - 1];
-        if (range1)
-            position2 += Math.round((position - positions1[index - 1]) * range2 / range1);
-        return position2;
+        return WebInspector.SourceMapping.prototype._sourceLocationToScriptLocation.call(this, originalLocation.lineNumber, originalLocation.columnNumber);
     }
 }

trunk/Source/WebCore/inspector/front-end/SourceFrame.js

@@ -40 +40 @@
 
     this._textViewer = new WebInspector.TextViewer(this._textModel, WebInspector.platform, this._url, this);
+    this._textViewer.element.addStyleClass("script-view");
     this._visible = false;
 
@@ -306 +307 @@
 
         var element = this._textViewer.element;
-        element.addStyleClass("script-view");
         if (this._delegate.debuggingSupported()) {
             element.addEventListener("contextmenu", this._contextMenu.bind(this), true);