[Chromoting] Make the Windows host controller ask the user to confirm host registration.

remoting/host/elevated_controller_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/elevated_controller_win.h"
 
 #include <sddl.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/win/scoped_handle.h"
 #include "remoting/host/branding.h"
+#include "remoting/host/elevated_controller_resource.h"
+#include "remoting/host/verify_config_window_win.h"
+
+// HINSTANCE from WinMain. This is needed to find our dialog resource.
+// This is defined in elevated_controller_module_win.cc
+extern HINSTANCE g_hInstance;
 
 namespace {
 
 // The host configuration file name.
 const FilePath::CharType kConfigFileName[] = FILE_PATH_LITERAL("host.json");
 
 // The extension for the temporary file.
 const FilePath::CharType kTempFileExtension[] = FILE_PATH_LITERAL("json~");
 
 // The host configuration file security descriptor that enables full access to
@@ skipping 60 matching lines @@
 }
 
 // Writes the configuration file up to |kMaxConfigFileSize| in size.
 HRESULT WriteConfig(const FilePath& filename,
                     const char* content,
                     size_t length) {
   if (length > kMaxConfigFileSize) {
       return E_FAIL;
   }
 
+  // Extract the configuration data that the user will verify.
+  scoped_ptr<base::Value> configValue(base::JSONReader::Read(content));

[alexeypa (please no reviews), 2012/04/12 21:20:41]

configValue -> config_value

[simonmorris, 2012/04/12 22:11:44]

Done.

+  if (!configValue.get()) {
+    return E_FAIL;
+  }
+  base::DictionaryValue* configDict = NULL;

[alexeypa (please no reviews), 2012/04/12 21:20:41]

configDict -> config_dict.

[simonmorris, 2012/04/12 22:11:44]

Done.

+  if (!configValue->GetAsDictionary(&configDict)) {
+    return E_FAIL;
+  }
+  std::string email, host_id, host_secret_hash;
+  if (!configDict->GetString("xmpp_login", &email) ||
+      !configDict->GetString("host_id", &host_id) ||
+      !configDict->GetString("host_secret_hash", &host_secret_hash)) {
+    return E_FAIL;
+  }
+
+  // Ask the user to verify the configuration.
+  remoting::VerifyConfigWindowWin verifyWin(email, host_id, host_secret_hash);

[alexeypa (please no reviews), 2012/04/12 21:20:41]

verifyWin -> verify_win

[simonmorris, 2012/04/12 22:11:44]

Done.

+  if (!verifyWin.Run()) {
+    return E_FAIL;

[alexeypa (please no reviews), 2012/04/12 21:20:41]

HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) _maybe_ a better choice, but I'm really
not sure.

[simonmorris, 2012/04/12 22:11:44]

This way is consistent with the existing code, which seems likely to make things
simpler for the consumer of the return code.

+  }
+
   // Create a security descriptor for the configuration file.
   SECURITY_ATTRIBUTES security_attributes;
   security_attributes.nLength = sizeof(security_attributes);
   security_attributes.bInheritHandle = FALSE;
 
   ULONG security_descriptor_length = 0;
   if (!ConvertStringSecurityDescriptorToSecurityDescriptorA(
            kConfigFileSecurityDescriptor,
            SDDL_REVISION_1,
            reinterpret_cast<PSECURITY_DESCRIPTOR*>(
@@ skipping 179 matching lines @@
         << "Failed to open to the '" << kWindowsServiceName << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting