Use GoogleUpdate.exe itself when elevating machine handoff installs

This CL stops copying the `metainstaller` to the versioned install directory, and instead uses `GoogleUpdate.exe` within the same secure `%programfiles%` directory for elevating a machine install.

The `metainstaller` was previously needed for cross-install scenarios, i.e., a user installation `/handoff` doing a machine install, where elevating the entire `metainstaller` was safer. However, that scenario was only used by the ActiveX/plugin code, and is no longer in use.

Author: sorinj

omaha/client/install.cc

@@ -247,10 +247,11 @@ HRESULT ElevateAndWait(const CString& cmd_line, DWORD* exit_code) {
   SafeCStringAppendFormat(&cmd_line_elevated, _T(" /%s"),
                           kCmdLineInstallElevated);
 
-  HRESULT hr = goopdate_utils::StartElevatedMetainstaller(cmd_line_elevated,
-                                                          exit_code);
+  HRESULT hr = goopdate_utils::StartElevatedSelfWithArgsAndWait(
+      cmd_line_elevated, exit_code);
   if (FAILED(hr)) {
-    OPT_LOG(LE, (_T("[Elevated metainstaller failed][%s][%#x]"), cmd_line, hr));
+    OPT_LOG(LE,
+            (_T("[Elevated GoogleUpdate.exe failed][%s][%#x]"), cmd_line, hr));
 
     // TODO(omaha3): Report hr somehow. Was reported in extra code in Omaha 2.
     if (vista_util::IsUserNonElevatedAdmin()) {

omaha/common/goopdate_utils.cc

@@ -308,39 +308,29 @@ CString BuildGoogleUpdateServicesEnclosedPath(bool is_machine, bool use64bit) {
   return path;
 }
 
-HRESULT StartElevatedMetainstaller(const TCHAR* args, DWORD* exit_code) {
+HRESULT StartElevatedSelfWithArgsAndWait(const TCHAR* args, DWORD* exit_code) {
   ASSERT1(args);
   ASSERT1(exit_code);
-  CORE_LOG(L3, (_T("[StartElevatedMetainstaller]")));
 
-  CPath metainstaller_path(app_util::GetCurrentModuleDirectory());
-  VERIFY1(metainstaller_path.Append(kOmahaMetainstallerFileName));
-  if (!File::Exists(metainstaller_path)) {
-    return GOOPDATE_E_METAINSTALLER_NOT_FOUND;
-  }
+  CORE_LOG(L3, (_T("[StartElevatedSelfWithArgsAndWait]")));
 
-  // In case the metainstaller has been tagged, append the /no_mi_tag switch
-  // to the end of the command line to signal the MI to not append its tag.
-  // The MI will remove the switch before launching the constant shell.
-  // TODO(omaha): Once the ApplyTag library has been refactored to allow
-  // removal/truncation of tags, remove the tag as part of setup (so that the
-  // MI in the permanent install is always untagged) and eliminate this switch.
-  CString new_args;
-  SafeCStringFormat(&new_args, _T("%s /%s"), args, kCmdLineNoMetainstallerTag);
+  // Get the process executable.
+  const CString filename(app_util::GetModulePath(NULL));
 
-  // Launch metainstaller elevated and wait.
+  // Launch self elevated and wait.
   *exit_code = 0;
-  CORE_LOG(L3, (_T("[Elevating][%s][%s]"), metainstaller_path, new_args));
+  CORE_LOG(L3, (_T("[Elevating][%s][%s]"), filename, args));
 
   // According to the MSDN documentation for ::ShowWindow: "nCmdShow. This
   // parameter is ignored the first time an application calls ShowWindow, if
   // the program that launched the application provides a STARTUPINFO
   // structure.". We want to force showing the UI window. So we pass in
   // SW_SHOWNORMAL.
-  HRESULT hr = vista_util::RunElevated(metainstaller_path,
-                                       new_args,
-                                       SW_SHOWNORMAL,
-                                       exit_code);
+  HRESULT hr =
+      vista_util::RunElevated(filename,
+                              args,
+                              SW_SHOWNORMAL,
+                              exit_code);
   CORE_LOG(L3, (_T("[elevated instance exit code][%u]"), *exit_code));
 
   if (FAILED(hr)) {

omaha/common/goopdate_utils.h

@@ -100,9 +100,8 @@ HRESULT StartGoogleUpdateWithArgs(bool is_machine,
 // if we're running on a 64-bit OS.
 HRESULT StartCrashHandler(bool is_machine);
 
-// Starts the metainstaller in the same directory as the current module in an
-// elevated mode using the "Runas" verb.
-HRESULT StartElevatedMetainstaller(const TCHAR* args, DWORD* exit_code);
+// Runs the current executable in an elevated mode using the "Runas" verb.
+HRESULT StartElevatedSelfWithArgsAndWait(const TCHAR* args, DWORD* exit_code);
 
 // Registers security and sets the security values for the GoogleUpdate
 // process when running as a COM server.

omaha/setup/setup_files.cc

@@ -110,21 +110,6 @@ HRESULT SetupFiles::Install() {
     return hr;
   }
 
-  // Copy the metainstaller.  Since the metainstaller is tagged, its file size
-  // may vary; so, we always overwrite, even if it's the same version.
-  // TODO(omaha): Once we refactor our tag management functions to be capable
-  // of stripping the tag from a MI, change this so that we always copy over
-  // an untagged metainstaller instead.  Untagged metainstallers should always
-  // be the same size.
-  hr = CopyInstallFiles(metainstaller_files_, install_dir, true);
-  if (FAILED(hr)) {
-    OPT_LOG(LEVEL_ERROR, (_T("[Failed to copy metainstaller][0x%08x]"), hr));
-    if (E_ACCESSDENIED == hr) {
-      return GOOPDATE_E_ACCESSDENIED_COPYING_MI;
-    }
-    return hr;
-  }
-
   // Attempt to copy the optional files.
   hr = CopyInstallFiles(optional_files_, install_dir, should_over_install);
   if (FAILED(hr)) {
@@ -294,11 +279,9 @@ HRESULT SetupFiles::SaveShellForRollback(const CString& shell_install_path) {
 }
 
 // The list of files below needs to be kept in sync with payload_files in
-// omaha_version_utils.py. The one exception is kOmahaMetainstallerFileName,
-// which is not part of the payload.
+// omaha_version_utils.py.
 HRESULT SetupFiles::BuildFileLists() {
   ASSERT1(core_program_files_.empty());
-  ASSERT1(metainstaller_files_.empty());
   ASSERT1(optional_files_.empty());
 
   core_program_files_.clear();
@@ -318,9 +301,6 @@ HRESULT SetupFiles::BuildFileLists() {
   core_program_files_.push_back(kPSFileNameMachine);
   core_program_files_.push_back(kPSFileNameMachine64);
 
-  metainstaller_files_.clear();
-  metainstaller_files_.push_back(kOmahaMetainstallerFileName);
-
   // If files are removed from this list, unit tests such as
   // ShouldInstall_SameVersionOptionalFileMissing may need to be updated.
   optional_files_.clear();

omaha/setup/setup_files.h

@@ -81,7 +81,6 @@ class SetupFiles {
   const bool is_machine_;
   CString saved_shell_path_;  // Path of the previous shell saved for roll back.
   std::vector<CString> core_program_files_;
-  std::vector<CString> metainstaller_files_;
   std::vector<CString> optional_files_;
 
   int extra_code1_;

omaha/setup/setup_files_unittest.cc

@@ -37,15 +37,14 @@ namespace {
 // Eventually use the original values in the if block.
 const int kNumberOfLanguageDlls = 55;
 const int kNumberOfCoreFiles = 10;
-const int kNumberOfMetainstallerFiles = 1;
 const int kNumberOfOptionalFiles = 2;
 const int kNumberOfInstalledRequiredFiles =
     kNumberOfLanguageDlls + kNumberOfCoreFiles;
 // FindFiles returns "." and ".." in addition to the actual files.
 const int kExtraFilesReturnedByFindFiles = 2;
-const int kExpectedFilesReturnedByFindFiles =
-    kNumberOfInstalledRequiredFiles + kNumberOfMetainstallerFiles +
-    kNumberOfOptionalFiles + kExtraFilesReturnedByFindFiles;
+const int kExpectedFilesReturnedByFindFiles = kNumberOfInstalledRequiredFiles +
+                                              kNumberOfOptionalFiles +
+                                              kExtraFilesReturnedByFindFiles;
 
 const TCHAR kFutureVersionString[] = _T("9.8.7.6");
 const ULONGLONG kFutureVersion = 0x0009000800070006;
@@ -70,7 +69,6 @@ void CopyGoopdateFiles(const CString& omaha_path, const CString& version) {
                           kOmahaShellFileName,
                           kOmahaCOMRegisterShell64,
                           kOmahaDllName,
-                          kOmahaMetainstallerFileName,
                           kOmahaBrokerFileName,
                           kOmahaOnDemandFileName,
                           kPSFileNameMachine,
@@ -157,8 +155,6 @@ class SetupFilesTest : public testing::Test {
 
     ASSERT_EQ(kNumberOfInstalledRequiredFiles,
               setup_files_->core_program_files_.size());
-    ASSERT_EQ(kNumberOfMetainstallerFiles,
-              setup_files_->metainstaller_files_.size());
     ASSERT_EQ(kNumberOfOptionalFiles, setup_files_->optional_files_.size());
 
     DeleteDirectory(version_path);
@@ -198,8 +194,6 @@ class SetupFilesTest : public testing::Test {
         extra_files.find(kOmahaCoreFileName), extra_files.end());
     EXPECT_NE(
         extra_files.find(kOmahaOnDemandFileName), extra_files.end());
-    EXPECT_NE(
-        extra_files.find(kOmahaMetainstallerFileName), extra_files.end());
     EXPECT_NE(
         extra_files.find(kOmahaDllName), extra_files.end());
     EXPECT_NE(