Changeset 90621 in webkit

Timestamp:

Jul 8, 2011 4:56:56 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r90615.
​http://trac.webkit.org/changeset/90615
​https://bugs.webkit.org/show_bug.cgi?id=64158

broke inspector/extensions/extensions.html (Requested by caseq
on #webkit).

• inspector/front-end/ExtensionAPI.js:

(WebInspector.injectedExtensionAPI.Panels.prototype.create):
(WebInspector.injectedExtensionAPI.ExtensionSidebarPaneImpl.prototype.setPage):
(WebInspector.injectedExtensionAPI.expandURL):

• inspector/front-end/ExtensionPanel.js:

(WebInspector.ExtensionPanel):

• inspector/front-end/ExtensionServer.js:

(WebInspector.ExtensionServer):
(WebInspector.ExtensionServer.prototype._onCreatePanel):
(WebInspector.ExtensionServer.prototype._onSetSidebarPage):
(WebInspector.ExtensionServer.prototype._addExtensions):
(WebInspector.ExtensionServer.prototype._onWindowMessage):
(WebInspector.ExtensionServer.prototype._registerSubscriptionHandler):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ExtensionAPI.js (modified) (4 diffs)
• inspector/front-end/ExtensionPanel.js (modified) (1 diff)
• inspector/front-end/ExtensionServer.js (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Adam Barth  <abarth@webkit.org>
+
+        Unreviewed, rolling out r90615.
+        http://trac.webkit.org/changeset/90615
+        https://bugs.webkit.org/show_bug.cgi?id=64158
+
+        broke inspector/extensions/extensions.html (Requested by caseq
+        on #webkit).
+
+        * inspector/front-end/ExtensionAPI.js:
+        (WebInspector.injectedExtensionAPI.Panels.prototype.create):
+        (WebInspector.injectedExtensionAPI.ExtensionSidebarPaneImpl.prototype.setPage):
+        (WebInspector.injectedExtensionAPI.expandURL):
+        * inspector/front-end/ExtensionPanel.js:
+        (WebInspector.ExtensionPanel):
+        * inspector/front-end/ExtensionServer.js:
+        (WebInspector.ExtensionServer):
+        (WebInspector.ExtensionServer.prototype._onCreatePanel):
+        (WebInspector.ExtensionServer.prototype._onSetSidebarPage):
+        (WebInspector.ExtensionServer.prototype._addExtensions):
+        (WebInspector.ExtensionServer.prototype._onWindowMessage):
+        (WebInspector.ExtensionServer.prototype._registerSubscriptionHandler):
+
 2011-07-07  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -168 +168 @@
 
 Panels.prototype = {
-    create: function(title, icon, page, callback)
+    create: function(title, iconURL, pageURL, callback)
     {
         var id = "extension-panel-" + extensionServer.nextObjectId();
@@ -175 +175 @@
             id: id,
             title: title,
-            icon: icon,
-            page: page
+            icon: expandURL(iconURL),
+            url: expandURL(pageURL)
         };
         extensionServer.sendRequest(request, callback && bind(callback, this, new ExtensionPanel(id)));
@@ -249 +249 @@
     },
 
-    setPage: function(page)
-    {
-        extensionServer.sendRequest({ command: "setSidebarPage", id: this._id, page: page });
+    setPage: function(url)
+    {
+        extensionServer.sendRequest({ command: "setSidebarPage", id: this._id, url: expandURL(url) });
     }
 }
@@ -441 +441 @@
 }
 
+function expandURL(url)
+{
+    if (!url)
+        return url;
+    if (/^[^/]+:/.exec(url)) // See if url has schema.
+        return url;
+    var baseURL = location.protocol + "//" + location.hostname + location.port;
+    if (/^\//.exec(url))
+        return baseURL + url;
+    return baseURL + location.pathname.replace(/\/[^/]*$/,"/") + url;
+}
+
 function bind(func, thisObject)
 {

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

@@ -32 +32 @@
 {
     this.toolbarItemLabel = label;
-    if (iconURL)
-        this._addStyleRule(".toolbar-item." + id + " .toolbar-icon", "background-image: url(" + iconURL + ");");
+    this._addStyleRule(".toolbar-item." + id + " .toolbar-icon", "background-image: url(" + iconURL + ");");
     WebInspector.Panel.call(this, id);
 }

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

@@ -39 +39 @@
     this._resources = {};
     this._lastResourceId = 0;
-    this._allowedOrigins = {};
     this._status = new WebInspector.ExtensionStatus();
 
@@ -205 +204 @@
             return this._status.E_EXISTS(id);
 
-        var panel = new WebInspector.ExtensionPanel(id, message.title, this._expandResourcePath(port._extensionOrigin, message.icon));
+        var panel = new WebInspector.ExtensionPanel(id, message.title, message.icon);
         this._clientObjects[id] = panel;
         WebInspector.panels[id] = panel;
         WebInspector.addPanel(panel);
 
-        var iframe = this.createClientIframe(panel.element, this._expandResourcePath(port._extensionOrigin, message.page));
+        var iframe = this.createClientIframe(panel.element, message.url);
         iframe.addStyleClass("panel");
         return this._status.OK();
@@ -259 +258 @@
     },
 
-    _onSetSidebarPage: function(message, port)
+    _onSetSidebarPage: function(message)
     {
         var sidebar = this._clientObjects[message.id];
         if (!sidebar)
             return this._status.E_NOTFOUND(message.id);
-        sidebar.setPage(this._expandResourcePath(port._extensionOrigin, message.page));
+        sidebar.setPage(message.url);
     },
 
@@ -403 +402 @@
     _addExtensions: function(extensions)
     {
-        const urlOriginRegExp = new RegExp("([^:]+:\/\/[^/]*)\/"); // Can't use regexp literal here, MinJS chokes on it.
-
         // See ExtensionAPI.js and ExtensionCommon.js for details.
         InspectorFrontendHost.setExtensionAPI(this._buildExtensionAPIInjectedScript());
@@ -412 +409 @@
                 if (!extension.startPage)
                     return;
-                var originMatch = urlOriginRegExp.exec(extension.startPage);
-                if (!originMatch) {
-                    console.error("Skipping extension with invalid URL: " + extension.startPage);
-                    continue;
-                }
-                this._allowedOrigins[originMatch[1]] = true;
                 var iframe = document.createElement("iframe");
                 iframe.src = extension.startPage;
@@ -451 +442 @@
         if (event.data !== "registerExtension")
             return;
-        if (!this._allowedOrigins.hasOwnProperty(event.origin)) {
-            console.error("Ignoring unauthorized client request from " + event.origin);
-            return;
-        }
         var port = event.ports[0];
-        port._extensionOrigin = event.origin;
         port.addEventListener("message", this._onmessage.bind(this), false);
         port.start();
@@ -484 +470 @@
         this._subscriptionStartHandlers[eventTopic] =  onSubscribeFirst;
         this._subscriptionStopHandlers[eventTopic] =  onUnsubscribeLast;
-    },
-
-    _expandResourcePath: function(extensionPath, resourcePath)
-    {
-        if (!resourcePath)
-            return;
-        return extensionPath + escape(this._normalizePath(resourcePath));
-    },
-
-    _normalizePath: function(path)
-    {
-        var source = path.split("/");
-        var result = [];
-
-        for (var i = 0; i < source.length; ++i) {
-            if (source[i] === ".")
-                continue;
-            // Ignore empty path components resulting from //, as well as a leading and traling slashes.
-            if (source[i] === "")
-                continue;
-            if (source[i] === "..")
-                result.pop();
-            else
-                result.push(source[i]);
-        }
-        return "/" + result.join("/");
     }
 }