Add support for multiple allowed domains

remoting/host/policy_watcher.cc

 // Copyright 2015 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.
 
 // Most of this code is copied from:
 //   src/chrome/browser/policy/asynchronous_policy_loader.{h,cc}
 
 #include "remoting/host/policy_watcher.h"
 
 #include <utility>
@@ skipping 163 matching lines @@
       owned_schema_registry_(std::move(owned_schema_registry)),
       owned_policy_provider_(std::move(owned_policy_provider)),
       owned_policy_service_(std::move(owned_policy_service)) {
   DCHECK(policy_service_);
   DCHECK(owned_schema_registry_);
 
   // Initialize the default values for each policy.
   default_values_->SetBoolean(key::kRemoteAccessHostFirewallTraversal, true);
   default_values_->SetBoolean(key::kRemoteAccessHostRequireCurtain, false);
   default_values_->SetBoolean(key::kRemoteAccessHostMatchUsername, false);
-  default_values_->SetString(key::kRemoteAccessHostClientDomain, std::string());
-  default_values_->SetString(key::kRemoteAccessHostDomain, std::string());
+  default_values_->Set(key::kRemoteAccessHostClientDomainList,
+                       base::MakeUnique<base::ListValue>());
+  default_values_->Set(key::kRemoteAccessHostDomainList,
+                       base::MakeUnique<base::ListValue>());
   default_values_->SetString(key::kRemoteAccessHostTalkGadgetPrefix,
                              kDefaultHostTalkGadgetPrefix);
   default_values_->SetString(key::kRemoteAccessHostTokenUrl, std::string());
   default_values_->SetString(key::kRemoteAccessHostTokenValidationUrl,
                              std::string());
   default_values_->SetString(
       key::kRemoteAccessHostTokenValidationCertificateIssuer, std::string());
   default_values_->SetBoolean(key::kRemoteAccessHostAllowClientPairing, true);
   default_values_->SetBoolean(key::kRemoteAccessHostAllowGnubbyAuth, true);
   default_values_->SetBoolean(key::kRemoteAccessHostAllowRelayedConnection,
@@ skipping 29 matching lines @@
 
   std::string path;
   std::string error;
   bool changed = false;
   const policy::Schema* schema = GetPolicySchema();
   if (schema->Normalize(policy_dict, strategy, &path, &error, &changed)) {
     if (changed) {
       LOG(WARNING) << "Unknown (unrecognized or unsupported) policy: " << path
                    << ": " << error;
     }
+    HandleDeprecatedPolicies(policy_dict);
     return true;
   } else {
     LOG(ERROR) << "Invalid policy contents: " << path << ": " << error;
     return false;
   }
 }
 
+void PolicyWatcher::HandleDeprecatedPolicies(base::DictionaryValue* dict) {
+  // RemoteAccessHostDomain
+  if (dict->HasKey(policy::key::kRemoteAccessHostDomain)) {
+    if (!dict->HasKey(policy::key::kRemoteAccessHostDomainList)) {
+      std::string domain;
+      dict->GetString(policy::key::kRemoteAccessHostDomain, &domain);
+      auto list = base::MakeUnique<base::ListValue>();
+      list->AppendString(domain);
+      dict->Set(policy::key::kRemoteAccessHostDomainList, std::move(list));
+    }
+    dict->Remove(policy::key::kRemoteAccessHostDomain, nullptr);
+  }
+
+  // RemoteAccessHostClientDomain
+  if (dict->HasKey(policy::key::kRemoteAccessHostClientDomain)) {
+    if (!dict->HasKey(policy::key::kRemoteAccessHostClientDomainList)) {
+      std::string domain;
+      dict->GetString(policy::key::kRemoteAccessHostClientDomain, &domain);
+      auto list = base::MakeUnique<base::ListValue>();
+      list->AppendString(domain);
+      dict->Set(policy::key::kRemoteAccessHostClientDomainList,
+                std::move(list));
+    }
+    dict->Remove(policy::key::kRemoteAccessHostClientDomain, nullptr);
+  }
+}

[Jamie, 2017/04/19 00:29:02]

Does the existing PolicyWatcher test code cover this?

[rkjnsn, 2017/04/19 16:45:26]

It's getting exercised by the It2MeHost tests, but it probably makes sense to
add an explicit test in the PolicyWatcher tests.

+
 namespace {
 void CopyDictionaryValue(const base::DictionaryValue& from,
                          base::DictionaryValue& to,
                          std::string key) {
   const base::Value* value;
   if (from.Get(key, &value)) {
     to.Set(key, value->CreateDeepCopy());
   }
 }
 }  // namespace
@@ skipping 137 matching lines @@
   return PolicyWatcher::CreateFromPolicyLoader(std::move(policy_loader));
 #endif  // !(OS_CHROMEOS)
 }
 
 std::unique_ptr<PolicyWatcher> PolicyWatcher::CreateFromPolicyLoaderForTesting(
     std::unique_ptr<policy::AsyncPolicyLoader> async_policy_loader) {
   return CreateFromPolicyLoader(std::move(async_policy_loader));
 }
 
 }  // namespace remoting