Bug 436207: Display error when install fails due to missing install.rdf. r+sr=dveditz
authorDave Townsend <dtownsend@oxymoronical.com>
Thu, 03 Jul 2008 17:36:10 +0100
changeset 15655 f795b4346cec01623554c4c95b24c02674504bc4
parent 15654 397a1c47022e27a7e8338ff5cdabeac6045a32ad
child 15656 966103bcd4895d9064a04d3de246b7637a90bce6
push idunknown
push userunknown
push dateunknown
bugs436207
milestone1.9.1a1pre
Bug 436207: Display error when install fails due to missing install.rdf. r+sr=dveditz
toolkit/mozapps/extensions/test/unit/addons/test_bug436207/install.js
toolkit/mozapps/extensions/test/unit/test_bug436207.js
xpinstall/src/nsXPInstallManager.cpp
new file mode 100644
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/unit/addons/test_bug436207/install.js
@@ -0,0 +1,1 @@
+// Test add-on that attempts to use install.js to install.
new file mode 100644
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/unit/test_bug436207.js
@@ -0,0 +1,64 @@
+/* ***** 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Dave Townsend <dtownsend@oxymoronical.com>.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 NO_INSTALL_SCRIPT = -204;
+
+var listener = {
+  onStateChange: function(index, state, value) {
+    if (state == Components.interfaces.nsIXPIProgressDialog.INSTALL_DONE)
+      do_check_eq(value, NO_INSTALL_SCRIPT);
+  },
+
+  onProgress: function(index, value, maxValue) {
+  }
+}
+
+function run_test() {
+  // Setup for test
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1");
+  startupEM();
+
+  var xpi = do_get_addon("test_bug436207");
+  var ioservice = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService);
+  var uri = ioservice.newFileURI(xpi);
+
+  var xpim = Components.classes["@mozilla.org/xpinstall/install-manager;1"]
+                       .createInstance(Components.interfaces.nsIXPInstallManager);
+  xpim.initManagerFromChrome([uri.spec], 1, listener);
+}
--- a/xpinstall/src/nsXPInstallManager.cpp
+++ b/xpinstall/src/nsXPInstallManager.cpp
@@ -710,16 +710,22 @@ OpenAndValidateArchive(nsIZipReader* hZi
 
     rv = VerifySigning(hZip, aPrincipal);
     if (NS_FAILED(rv))
     {
         NS_WARNING("Signing check of archive failed!");
         return nsInstall::INVALID_SIGNATURE;
     }
 
+    if (NS_FAILED(hZip->Test("install.rdf")))
+    {
+        NS_WARNING("Archive did not contain an install manifest!");
+        return nsInstall::NO_INSTALL_SCRIPT;
+    }
+
     return nsInstall::SUCCESS;
 }
 
 
 nsresult nsXPInstallManager::InstallItems()
 {
     nsresult rv;
     nsCOMPtr<nsIZipReader> hZip = do_CreateInstance(kZipReaderCID, &rv);