Save the client base JID for authentication in case it differs from the email (for accounts non-Goo…

remoting/host/win/elevated_controller.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/win/elevated_controller.h"
 
 #include "base/file_version_info.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 35 matching lines @@
 const char kConfigFileSecurityDescriptor[] =
     "O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)";
 
 const char kUnprivilegedConfigFileSecurityDescriptor[] =
     "O:BAG:BAD:(A;;GA;;;SY)(A;;GA;;;BA)(A;;GR;;;AU)";
 
 // Configuration keys.
 const char kHostId[] = "host_id";
 const char kXmppLogin[] = "xmpp_login";
 const char kHostOwner[] = "host_owner";
+const char kHostOwnerEmail[] = "host_owner_email";

[Sergey Ulanov, 2014/09/25 02:28:46]

I'm not sure why these values need to be duplicated. Instead of duplicating
these values here I think you can just include remoting/host/host_config.h .
Somewhat unrelated to this CL, to feel free to ignore.

[rmsousa, 2014/09/27 01:42:17]

Done.

 const char kHostSecretHash[] = "host_secret_hash";
 
 // The configuration keys that cannot be specified in UpdateConfig().
-const char* const kReadonlyKeys[] = { kHostId, kHostOwner, kXmppLogin };
+const char* const kReadonlyKeys[] = {
+  kHostId, kHostOwner, kHostOwnerEmail, kXmppLogin };
 
 // The configuration keys whose values may be read by GetConfig().
 const char* const kUnprivilegedConfigKeys[] = { kHostId, kXmppLogin };
 
 // Determines if the client runs in the security context that allows performing
 // administrative tasks (i.e. the user belongs to the adminstrators group and
 // the client runs elevated).
 bool IsClientAdmin() {
   HRESULT hr = CoImpersonateClient();
   if (FAILED(hr)) {
@@ skipping 142 matching lines @@
   // Extract the configuration data that the user will verify.
   scoped_ptr<base::Value> config_value(base::JSONReader::Read(content));
   if (!config_value.get()) {
     return E_FAIL;
   }
   base::DictionaryValue* config_dict = NULL;
   if (!config_value->GetAsDictionary(&config_dict)) {
     return E_FAIL;
   }
   std::string email;
-  if (!config_dict->GetString(kHostOwner, &email)) {
-    if (!config_dict->GetString(kXmppLogin, &email)) {
-      return E_FAIL;
+  if (!config_dict->GetString(kHostOwnerEmail, &email)) {
+    if (!config_dict->GetString(kHostOwner, &email)) {
+      if (!config_dict->GetString(kXmppLogin, &email)) {
+        return E_FAIL;
+      }
     }
   }
   std::string host_id, host_secret_hash;
   if (!config_dict->GetString(kHostId, &host_id) ||
       !config_dict->GetString(kHostSecretHash, &host_secret_hash)) {
     return E_FAIL;
   }
 
   // Ask the user to verify the configuration (unless the client is admin
   // already).
@@ skipping 285 matching lines @@
                 << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting