Bug 529597 - Places protocol handler, r=mak77,bz
authorDrew Willcoxon <adw@mozilla.com>
Tue, 29 Dec 2009 19:37:24 -0800
changeset 36771 6453f3ca39fc
parent 36770 64d3466e3964
child 36772 1d4355b162e6
push id10973
push userreed@reedloden.com
push dateThu, 31 Dec 2009 04:12:05 +0000
treeherdermozilla-central@6453f3ca39fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak77, bz
bugs529597
milestone1.9.3a1pre
Bug 529597 - Places protocol handler, r=mak77,bz
browser/components/places/src/Makefile.in
browser/components/places/src/PlacesProtocolHandler.js
browser/installer/package-manifest.in
toolkit/components/places/tests/Makefile.in
toolkit/components/places/tests/mochitest/test_bug_405924.html
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -50,13 +50,16 @@ FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 ifndef MOZ_MEMORY
 USE_STATIC_LIBS = 1
 endif
 
 
 CPPSRCS = nsPlacesImportExportService.cpp
 
-EXTRA_COMPONENTS = nsPlacesTransactionsService.js
+EXTRA_COMPONENTS = \
+  nsPlacesTransactionsService.js \
+  PlacesProtocolHandler.js \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += -I$(topsrcdir)/browser/components
new file mode 100644
--- /dev/null
+++ b/browser/components/places/src/PlacesProtocolHandler.js
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 et
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License
+ * at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ * the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * The Original Code is the Places protocol handler.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Drew Willcoxon <adw@mozilla.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+Components.utils.import("resource://gre/modules/NetUtil.jsm");
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const SCHEME = "place";
+const URL = "chrome://browser/content/places/content-ui/controller.xhtml";
+
+function PlacesProtocolHandler() {}
+
+PlacesProtocolHandler.prototype = {
+  scheme: SCHEME,
+  defaultPort: -1,
+  protocolFlags: Ci.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD |
+                 Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE |
+                 Ci.nsIProtocolHandler.URI_NORELATIVE |
+                 Ci.nsIProtocolHandler.URI_NOAUTH,
+
+  newURI: function PPH_newURI(aSpec, aOriginCharset, aBaseUri) {
+    let uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);
+    uri.spec = aSpec;
+    return uri;
+  },
+
+  newChannel: function PPH_newChannel(aUri) {
+    let chan = NetUtil.newChannel(URL);
+    chan.originalURI = aUri;
+    return chan;
+  },
+
+  allowPort: function PPH_allowPort(aPort, aScheme) {
+    return false;
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsIProtocolHandler
+  ]),
+
+  classDescription: "Places Protocol Handler",
+  contractID: "@mozilla.org/network/protocol;1?name=" + SCHEME,
+  classID: Components.ID("{6bcb9bde-9018-4443-a071-c32653469597}")
+};
+
+function NSGetModule(aCompMgr, aFileSpec) {
+  return XPCOMUtils.generateModule([
+    PlacesProtocolHandler
+  ]);
+}
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -313,16 +313,17 @@
 @BINPATH@/components/brwsrdir@DLL_SUFFIX@
 @BINPATH@/components/brwsrcmp@DLL_SUFFIX@
 #endif
 @BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/nsLivemarkService.js
 @BINPATH@/components/nsTaggingService.js
 @BINPATH@/components/nsPlacesDBFlush.js
 @BINPATH@/components/nsPlacesAutoComplete.js
+@BINPATH@/components/PlacesProtocolHandler.js
 @BINPATH@/components/nsDefaultCLH.js
 @BINPATH@/components/nsContentPrefService.js
 @BINPATH@/components/nsContentDispatchChooser.js
 @BINPATH@/components/nsHandlerService.js
 @BINPATH@/components/nsWebHandlerApp.js
 @BINPATH@/components/nsBadCertHandler.js
 @BINPATH@/components/nsFormAutoComplete.js
 #ifdef XP_MACOSX
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -51,28 +51,23 @@ XPCSHELL_TESTS = \
 	sync \
 	bookmarks \
 	queries \
 	unit \
 	$(NULL)
 
 # Simple MochiTests
 MOCHI_TESTS = \
-	mochitest/test_bug_405924.html \
 	mochitest/test_bug_411966.html \
 	mochitest/test_bug_461710.html \
 	$(NULL)
 
-MOCHI_CONTENT = \
-	mochitest/prompt_common.js \
-	$(NULL)
-
 DIRS = \
 	chrome \
 	mochitest/bug_411966 \
 	mochitest/bug_461710 \
 	browser \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(MOCHI_TESTS) $(MOCHI_CONTENT)
+libs:: $(MOCHI_TESTS)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
deleted file mode 100644
--- a/toolkit/components/places/tests/mochitest/test_bug_405924.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <!--
-    https://bugzilla.mozilla.org/show_bug.cgi?id=405924
-  -->
-  <head>
-    <title>Test for Bug 405924</title>
-    <script type="text/javascript" src="/MochiKit/packed.js"></script>
-    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-    <script type="text/javascript" src="prompt_common.js"></script>
-    <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  </head>
-  <body>
-    <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=405924">
-      Mozilla Bug 405924</a>
-    <p id="display"></p>
-    <div id="content" style="display: none">
-      <iframe id="iframe"></iframe>
-    </div>
-    <pre id="test">
-      <script class="testbody" type="text/javascript">
-
-      /** Test for Bug 405924 **/
-      netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-      var isDone = false;
-
-      // This is called from prompt_common when the error dialog shows up
-      function handleDialog(doc) {
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-        // Verify the error message is correct - the string (places) is not
-        // translated
-        var dialog = doc.getElementById("commonDialog");
-        var desc = doc.getElementById("info.body");
-        var errmsg = desc.childNodes[0].data;
-        ok(errmsg.match(/\(place\)/) || errmsg.match(/^place /), "Check for the correct message");
-
-        // Clear the dialog
-        dialog.acceptDialog();
-        // Declared in prompt_common and used to show that we flashed the error
-        // message
-        didDialog = true;
-        if (isDone) {
-          // Finish up
-          SimpleTest.finish();
-        }
-      }
-
-      // Called when the iFrame or the Window is reloaded
-      function onloadHandler() {
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-        // Make sure the alert dialog was shown if we do manage to complete
-        // the onload. (Usually the alert dialog blocks the onload event)
-        ok(didDialog, "Alert Dialog was shown");
-      }
-
-      function useXMLHttpRequest(aType, aUri, aValueToSend) {
-        var req = new XMLHttpRequest();
-
-        req.onreadystatechange=function() {
-          // If this completes, it's an error
-          if (req.readyState == 4)
-            ok(false, "XMLHttpRequest to Places URI succeeded: security breach");
-        }
-
-        try {
-          req.open(aType, aUri, false);
-          req.send(aValueToSend);
-          ok(false, "XMLHttpRequest did not throw - security breach");
-        } catch (ex) {
-          // Unfortunately it's an unknown error, so no use in trying to see
-          // what it was
-          // XMLHttpRequest to Places URI threw: expected behavior
-        }
-      }
-
-      // First try requesting a places URI from javascript - fails silently
-     useXMLHttpRequest("GET",
-                        "place:folder=BOOKMARKS_MENU&folder=UNFILED_BOOKMARKS&folder=TOOLBAR&sort=12&excludeQueries=1&queryType=1",
-                        null);
-
-     // Second, try posting to a places URI just for grins
-     useXMLHttpRequest("POST",
-                       "place:folder=UNFILED_BOOKMARKS&sort=12&queryType=1",
-                       "SELECT%20*%20FROM%20moz_places");
-
-     // Third test, use the iFrame and try loading directly
-     var iframe = document.getElementById("iframe");
-     iframe.onload = onloadHandler;
-     startCallbackTimer();
-     try {
-       // This one probably won't throw but it will show the Error Dialog
-       iframe.src = "place:sort=14&type=6&maxResults=10";
-       todo(false, "This should throw: bug 428585")
-     } catch (ex) {
-       // Bug 428585: This should throw
-     }
-
-     // And finally, go for broke
-     window.onload = onloadHandler;
-     isDone = true;
-     startCallbackTimer();
-     try {
-       window.content.document.location.href = "place:sort=8&maxResults=10";
-       ok(false, "Window set to places URI did not throw - security breach");
-     } catch (ex) {
-       // Window set to places URI threw exception: expected behavior
-     }
-
-     // We finish up in the onloadHandler
-     SimpleTest.waitForExplicitFinish();
-     </script>
-   </pre>
- </body>
-</html>
-