Bug 526598 - NS_ERROR_FILE_ACCESS_DENIED from nsIZipReader.extract makes extension installs fail. r=rstrong, a=beltzner

toolkit/mozapps/extensions/src/nsExtensionManager.js.in

@@ -1576,54 +1576,6 @@ function safeInstallOperation(itemID, installLocation, file) {
     }
   }
 
-  /**
-   * Extracts an XPI's files into the item's directory.
-   * @param   itemID
-   *          The ID of the item being installed.
-   * @param   installLocation
-   *          The install location where the item is being installed.
-   * @param   xpiFile
-   *          The source XPI file that contains the item.
-   */
-  function extractFiles(itemID, installLocation, xpiFile) {
-    var zipReader = getZipReaderForFile(xpiFile);
-
-    // create directories first
-    var entries = zipReader.findEntries("*/");
-    while (entries.hasMore()) {
-      var entryName = entries.getNext();
-      var target = installLocation.getItemFile(itemID, entryName);
-      if (!target.exists()) {
-        try {
-          target.create(Ci.nsILocalFile.DIRECTORY_TYPE,
-                        FileUtils.PERMS_DIRECTORY);
-        }
-        catch (e) {
-          ERROR("extractFiles: failed to create target directory for extraction " +
-                "file = " + target.path + ", exception = " + e + "\n");
-        }
-      }
-    }
-
-    entries = zipReader.findEntries(null);
-    while (entries.hasMore()) {
-      var entryName = entries.getNext();
-      target = installLocation.getItemFile(itemID, entryName);
-      if (target.exists())
-        continue;
-
-      try {
-        target.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE);
-      }
-      catch (e) {
-        ERROR("extractFiles: failed to create target file for extraction " +
-              "file = " + target.path + ", exception = " + e + "\n");
-      }
-      zipReader.extract(entryName, target);
-    }
-    zipReader.close();
-  }
-
   if (!installLocation.itemIsManagedIndependently(itemID)) {
     var itemLocation = installLocation.getItemLocation(itemID);
     if (itemLocation.exists()) {
@@ -1697,7 +1649,35 @@ function safeInstallOperation(itemID, installLocation, file) {
   if (file) {
     // Extract the xpi's files into the new directory
     try {
-      extractFiles(itemID, installLocation, file);
+      var zipReader = getZipReaderForFile(file);
+
+      // create directories first
+      var entries = zipReader.findEntries("*/");
+      while (entries.hasMore()) {
+        var entryName = entries.getNext();
+        var target = installLocation.getItemFile(itemID, entryName);
+        if (!target.exists()) {
+          try {
+            target.create(Ci.nsILocalFile.DIRECTORY_TYPE,
+                          FileUtils.PERMS_DIRECTORY);
+          }
+          catch (e) {
+            ERROR("extractFiles: failed to create target directory for extraction " +
+                  "file = " + target.path + ", exception = " + e + "\n");
+          }
+        }
+      }
+
+      entries = zipReader.findEntries(null);
+      while (entries.hasMore()) {
+        var entryName = entries.getNext();
+        target = installLocation.getItemFile(itemID, entryName);
+        if (target.exists())
+          continue;
+
+        zipReader.extract(entryName, target);
+        target.permissions = FileUtils.PERMS_FILE;
+      }
     }
     catch (e) {
       // This means the install operation failed. Remove everything and roll back.
@@ -1718,6 +1698,10 @@ function safeInstallOperation(itemID, installLocation, file) {
       cleanUpTrash(itemLocationTrash);
       throw e;
     }
+    finally {
+      if (zipReader)
+        zipReader.close();
+    }
   }
 
   // Now, and only now - after everything else has succeeded (against all odds!)

toolkit/mozapps/extensions/test/unit/test_bug526598.js

@@ -0,0 +1,73 @@
+/* ***** 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) 2009
+ * 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 *****
+ */
+
+function run_test() {
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
+
+  const dataDir = do_get_file("data");
+
+  startupEM();
+
+  gEM.installItemFromFile(do_get_file("data/test_bug526598_1.xpi"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+  gEM.installItemFromFile(do_get_file("data/test_bug526598_2.xpi"),
+                          NS_INSTALL_LOCATION_APPPROFILE);
+
+  restartEM();
+  do_check_neq(gEM.getItemForID("bug526598_1@tests.mozilla.org"), null);
+  do_check_neq(gEM.getItemForID("bug526598_2@tests.mozilla.org"), null);
+
+  var il = gEM.getInstallLocation("bug526598_1@tests.mozilla.org");
+  var file = il.getItemFile("bug526598_1@tests.mozilla.org", "install.rdf");
+  do_check_true(file.exists());
+  do_check_true(file.isReadable());
+  do_check_true(file.isWritable());
+
+  il = gEM.getInstallLocation("bug526598_2@tests.mozilla.org");
+  file = il.getItemFile("bug526598_2@tests.mozilla.org", "install.rdf");
+  do_check_true(file.exists());
+  do_check_true(file.isReadable());
+  do_check_true(file.isWritable());
+
+  gEM.uninstallItem("bug526598_1@tests.mozilla.org");
+  gEM.uninstallItem("bug526598_2@tests.mozilla.org");
+
+  restartEM();
+  do_check_eq(gEM.getItemForID("bug526598_1@tests.mozilla.org"), null);
+  do_check_eq(gEM.getItemForID("bug526598_2@tests.mozilla.org"), null);
+}