Support for checking multiple keyfiles when removing an installation package....

chrome/installer/util/delete_tree_work_item.cc

Index: chrome/installer/util/delete_tree_work_item.cc
===================================================================
--- chrome/installer/util/delete_tree_work_item.cc	(revision 67848)
+++ chrome/installer/util/delete_tree_work_item.cc	(working copy)
@@ -6,6 +6,17 @@
 #include "base/logging.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
 
+DeleteTreeWorkItem::DeleteTreeWorkItem(
+    const FilePath& root_path,
+    const std::vector<FilePath>& key_paths)
+    : root_path_(root_path) {
+  // Populate our key_paths_ list with empty backup path values.
+  std::vector<FilePath>::const_iterator it = key_paths.begin();

[robertshield, 2010/12/01 21:40:54]

nitty nit: KeyFileList::const_iterator it(key_paths_.begin());
here and below

[tommi (sloooow) - chröme, 2010/12/01 22:07:15]

Done.

+  for (; it != key_paths.end(); ++it) {
+    key_paths_.push_back(KeyFileList::value_type(*it, FilePath()));
+  }
+}
+
 DeleteTreeWorkItem::~DeleteTreeWorkItem() {
   if (!backup_path_.empty()) {
     FilePath tmp_dir = backup_path_.DirName();
@@ -13,33 +24,75 @@
       file_util::Delete(tmp_dir, true);
     }
   }
-  if (!key_backup_path_.empty()) {
-    FilePath tmp_dir = key_backup_path_.DirName();
-    if (file_util::PathExists(tmp_dir)) {
-      file_util::Delete(tmp_dir, true);
+
+  KeyFileList::const_iterator it = key_paths_.begin();
+  for (; it != key_paths_.end(); ++it) {
+    if (!it->second.empty()) {
+      FilePath tmp_dir = it->second.DirName();
+      if (file_util::PathExists(tmp_dir)) {
+        file_util::Delete(tmp_dir, true);
+      }
     }
   }
 }
 
-DeleteTreeWorkItem::DeleteTreeWorkItem(const std::wstring& root_path,
-                                       const std::wstring& key_path)
-    : root_path_(root_path),
-      key_path_(key_path) {
-}
-
 // We first try to move key_path_ to backup_path. If it succeeds, we go ahead
 // and move the rest.
 bool DeleteTreeWorkItem::Do() {
-  if (!key_path_.empty() && file_util::PathExists(key_path_)) {
-    if (!GetBackupPath(key_path_, &key_backup_path_) ||
-        !file_util::CopyDirectory(key_path_, key_backup_path_, true) ||
-        !file_util::Delete(key_path_, true)) {
-      LOG(ERROR) << "can not delete " << key_path_.value()
-                 << " OR copy it to backup path " << key_backup_path_.value();
-      return false;
+  // Go through all the key files and see if we can open them exclusively
+  // with only the FILE_FLAG_SHARE_DELETE flag.  Once we know we have all

[robertshield, 2010/12/01 21:40:54]

*FILE_SHARE_DELETE

[tommi (sloooow) - chröme, 2010/12/01 22:07:15]

Done.

+  // of them, we can delete them.
+  KeyFileList::iterator it = key_paths_.begin();
+  std::vector<HANDLE> opened_key_files;
+  bool abort = false;
+  for (; !abort && it != key_paths_.end(); ++it) {
+    if (!GetBackupPath(it->first, &it->second) ||
+        !file_util::CopyFile(it->first, it->second)) {
+      PLOG(ERROR) << "Could not back up: " << it->first.value();
+      abort = true;
+    } else {
+      HANDLE file = ::CreateFile(it->first.value().c_str(), FILE_ALL_ACCESS,
+                                 FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0,
+                                 NULL);
+      if (file != INVALID_HANDLE_VALUE) {
+        VLOG(1) << "Acquired exclusive lock for key file: "
+                << it->first.value();
+        opened_key_files.push_back(file);
+      } else {
+        if (::GetLastError() != ERROR_FILE_NOT_FOUND)
+          abort = true;
+        PLOG(INFO) << "Failed to open " << it->first.value();
+      }
     }
   }
 
+  if (!abort) {
+    // We now hold exclusive locks with "share delete" permissions for each
+    // of the key files and also have created backups of those files.
+    // We can safely delete the key files now.
+    it = key_paths_.begin();
+    for (; !abort && it != key_paths_.end(); ++it) {
+      if (!file_util::Delete(it->first, true)) {
+        // This should not really be possible because of the above.
+        NOTREACHED();
+        PLOG(ERROR) << "Unexpectedly could not delete " << it->first.value();
+        abort = true;
+      }
+    }
+  }
+
+  std::vector<HANDLE>::const_iterator file_it = opened_key_files.begin();
+  for (; file_it != opened_key_files.end(); ++file_it)
+    ::CloseHandle(*file_it);
+
+  opened_key_files.clear();
+
+  if (abort) {
+    LOG(ERROR) << "Could not exclusively hold all key files.";
+    return false;
+  }
+
+  // Now that we've taken care of the key files, take care of the rest.
   if (!root_path_.empty() && file_util::PathExists(root_path_)) {
     if (!GetBackupPath(root_path_, &backup_path_) ||
         !file_util::CopyDirectory(root_path_, backup_path_, true) ||
@@ -49,6 +102,7 @@
       return false;
     }
   }
+
   return true;
 }
 
@@ -57,8 +111,16 @@
   if (!backup_path_.empty() && file_util::PathExists(backup_path_)) {
     file_util::Move(backup_path_, root_path_);
   }
-  if (!key_backup_path_.empty() && file_util::PathExists(key_backup_path_)) {
-    file_util::Move(key_backup_path_, key_path_);
+
+  KeyFileList::const_iterator it = key_paths_.begin();
+  for (; it != key_paths_.end(); ++it) {
+    if (!it->second.empty() && file_util::PathExists(it->second)) {
+      if (!file_util::Move(it->second, it->first)) {
+        // This could happen if we could not delete the key file to begin with.
+        PLOG(WARNING) << "Rollback: Failed to move backup file back in place: "
+                      << it->second.value() << " to " << it->first.value();
+      }
+    }
   }
 }