Policy Ui sends correct translations for risk tags.

chrome/browser/ui/webui/policy_ui.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 "chrome/browser/ui/webui/policy_ui.h"
 
 #include <stddef.h>
+#include <string.h>

[Dan Beam, 2015/10/14 21:00:40]

#include <string> (drop the .h)

[fhorschig, 2015/10/15 14:45:38]

Done.

 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/browser/cloud/message_util.h"
 #include "components/policy/core/browser/configuration_policy_handler_list.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
+#include "components/policy/core/common/policy_details.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/policy/core/common/remote_commands/remote_commands_service.h"
 #include "components/policy/core/common/schema.h"
 #include "components/policy/core/common/schema_map.h"
 #include "components/policy/core/common/schema_registry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "grit/browser_resources.h"
 #include "grit/components_strings.h"
+#include "grit/policy_resources.h"
+#include "grit/policy_resources_map.h"
 #include "policy/policy_constants.h"
 #include "policy/proto/device_management_backend.pb.h"
+#include "policy/risk_tag.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "components/user_manager/user_manager.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #endif
 
 namespace em = enterprise_management;
 
 namespace {
 
-struct PolicySourceMap {
+struct PolicyStringMap {
   const char* key;
   int string_id;
 };
 
 // Strings that map from PolicySource enum to i18n string keys and their IDs.
-const PolicySourceMap kPolicySources[policy::POLICY_SOURCE_COUNT] = {
+const PolicyStringMap kPolicySources[policy::POLICY_SOURCE_COUNT] = {
   {"sourceEnterpriseDefault", IDS_POLICY_SOURCE_ENTERPRISE_DEFAULT},
   {"sourceCloud", IDS_POLICY_SOURCE_CLOUD},
   {"sourcePublicSessionOverride", IDS_POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE},
   {"sourcePlatform", IDS_POLICY_SOURCE_PLATFORM}
 };
 
-void AddLocalizedPoilcySourceStrings(content::WebUIDataSource* source) {
-  DCHECK_EQ(static_cast<size_t>(policy::POLICY_SOURCE_COUNT),
-            arraysize(kPolicySources));
-  for (size_t i = 0; i < arraysize(kPolicySources); ++i) {
-    source->AddLocalizedString(kPolicySources[i].key,
-                               kPolicySources[i].string_id);
-  }
+// Strings that map from policy::RiskTag enum to i18n string keys and their IDs.
+const PolicyStringMap kPolicyRiskTags[policy::RISK_TAG_COUNT] = {
+  {"fullAdminAccess", IDS_POLICY_RISK_TAG_FULL_ADMIN_ACCESS},
+  {"systemSecurity", IDS_POLICY_RISK_TAG_SYSTEM_SECURITY},
+  {"websiteSharing", IDS_POLICY_RISK_TAG_WEBSITE_SHARING},
+  {"adminSharing", IDS_POLICY_RISK_TAG_ADMIN_SHARING},
+  {"filtering", IDS_POLICY_RISK_TAG_FILTERING},
+  {"localDataAccess", IDS_POLICY_RISK_TAG_LOCAL_DATA_ACCESS},
+  {"googleSharing", IDS_POLICY_RISK_TAG_GOOGLE_SHARING}

[Dan Beam, 2015/10/14 21:00:40]

nit: alphabetize these, also don't omit trailing commas (IMO)

[fhorschig, 2015/10/15 14:45:38]

Trailing comma added. Added a comment that the order relies the enum values and
should not be sorted otherwise.

+};
+
+void AddLocalizedPolicyStrings(content::WebUIDataSource* source,
+                               const PolicyStringMap* strings,
+                               size_t count) {
+  for (size_t i = 0; i < count; ++i)
+    source->AddLocalizedString(strings[i].key, strings[i].string_id);
 }
 
 void AddCommonLocalizedStringsToSource(content::WebUIDataSource* source) {
+  AddLocalizedPolicyStrings(source, kPolicySources,
+                            static_cast<size_t>(policy::POLICY_SOURCE_COUNT));
   source->AddLocalizedString("title", IDS_POLICY_TITLE);
+  source->AddLocalizedString("headerScope", IDS_POLICY_HEADER_SCOPE);
+  source->AddLocalizedString("headerLevel", IDS_POLICY_HEADER_LEVEL);
+  source->AddLocalizedString("headerName", IDS_POLICY_HEADER_NAME);
+  source->AddLocalizedString("headerValue", IDS_POLICY_HEADER_VALUE);
+  source->AddLocalizedString("headerStatus", IDS_POLICY_HEADER_STATUS);
+  source->AddLocalizedString("headerSource", IDS_POLICY_HEADER_SOURCE);
+  source->AddLocalizedString("scopeUser", IDS_POLICY_SCOPE_USER);
+  source->AddLocalizedString("scopeDevice", IDS_POLICY_SCOPE_DEVICE);
+  source->AddLocalizedString("levelRecommended", IDS_POLICY_LEVEL_RECOMMENDED);
+  source->AddLocalizedString("levelMandatory", IDS_POLICY_LEVEL_MANDATORY);
+  source->AddLocalizedString("ok", IDS_POLICY_OK);
+  source->AddLocalizedString("unset", IDS_POLICY_UNSET);
+  source->AddLocalizedString("unknown", IDS_POLICY_UNKNOWN);
+  source->AddLocalizedString("notSpecified", IDS_POLICY_NOT_SPECIFIED);
+  source->SetJsonPath("strings.js");
+}
+
+content::WebUIDataSource* CreatePolicyUIHtmlSource() {
+  content::WebUIDataSource* source =
+      content::WebUIDataSource::Create(chrome::kChromeUIPolicyHost);
+  AddCommonLocalizedStringsToSource(source);
   source->AddLocalizedString("filterPlaceholder",
                              IDS_POLICY_FILTER_PLACEHOLDER);
   source->AddLocalizedString("reloadPolicies", IDS_POLICY_RELOAD_POLICIES);
   source->AddLocalizedString("status", IDS_POLICY_STATUS);
   source->AddLocalizedString("statusDevice", IDS_POLICY_STATUS_DEVICE);
   source->AddLocalizedString("statusUser", IDS_POLICY_STATUS_USER);
   source->AddLocalizedString("labelDomain", IDS_POLICY_LABEL_DOMAIN);
   source->AddLocalizedString("labelUsername", IDS_POLICY_LABEL_USERNAME);
   source->AddLocalizedString("labelClientId", IDS_POLICY_LABEL_CLIENT_ID);
   source->AddLocalizedString("labelAssetId", IDS_POLICY_LABEL_ASSET_ID);
   source->AddLocalizedString("labelLocation", IDS_POLICY_LABEL_LOCATION);
   source->AddLocalizedString("labelDirectoryApiId",
                              IDS_POLICY_LABEL_DIRECTORY_API_ID);
   source->AddLocalizedString("labelTimeSinceLastRefresh",
                              IDS_POLICY_LABEL_TIME_SINCE_LAST_REFRESH);
   source->AddLocalizedString("labelRefreshInterval",
                              IDS_POLICY_LABEL_REFRESH_INTERVAL);
   source->AddLocalizedString("labelStatus", IDS_POLICY_LABEL_STATUS);
   source->AddLocalizedString("showUnset", IDS_POLICY_SHOW_UNSET);
   source->AddLocalizedString("noPoliciesSet", IDS_POLICY_NO_POLICIES_SET);
-  source->AddLocalizedString("headerScope", IDS_POLICY_HEADER_SCOPE);
-  source->AddLocalizedString("headerLevel", IDS_POLICY_HEADER_LEVEL);
-  source->AddLocalizedString("headerName", IDS_POLICY_HEADER_NAME);
-  source->AddLocalizedString("headerValue", IDS_POLICY_HEADER_VALUE);
-  source->AddLocalizedString("headerStatus", IDS_POLICY_HEADER_STATUS);
-  source->AddLocalizedString("headerSource", IDS_POLICY_HEADER_SOURCE);
   source->AddLocalizedString("showExpandedValue",
                              IDS_POLICY_SHOW_EXPANDED_VALUE);
   source->AddLocalizedString("hideExpandedValue",
                              IDS_POLICY_HIDE_EXPANDED_VALUE);
-  source->AddLocalizedString("scopeUser", IDS_POLICY_SCOPE_USER);
-  source->AddLocalizedString("scopeDevice", IDS_POLICY_SCOPE_DEVICE);
-  source->AddLocalizedString("levelRecommended", IDS_POLICY_LEVEL_RECOMMENDED);
-  source->AddLocalizedString("levelMandatory", IDS_POLICY_LEVEL_MANDATORY);
-  source->AddLocalizedString("ok", IDS_POLICY_OK);
-  source->AddLocalizedString("unset", IDS_POLICY_UNSET);
-  source->AddLocalizedString("unknown", IDS_POLICY_UNKNOWN);
-  source->AddLocalizedString("notSpecified", IDS_POLICY_NOT_SPECIFIED);
-  AddLocalizedPoilcySourceStrings(source);
-
-  source->SetJsonPath("strings.js");
+  // Add required resources.
+  source->AddResourcePath("policy.css", IDR_POLICY_CSS);
+  source->AddResourcePath("policy.js", IDR_POLICY_JS);
+  source->AddResourcePath("uber_utils.js", IDR_UBER_UTILS_JS);
+  source->SetDefaultResource(IDR_POLICY_HTML);
+  return source;
 }
 
 content::WebUIDataSource* CreatePolicyMaterialDesignUIHtmlSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIMdPolicyHost);
   AddCommonLocalizedStringsToSource(source);
+  AddLocalizedPolicyStrings(source, kPolicyRiskTags,
+                            static_cast<size_t>(policy::RISK_TAG_COUNT));
+  for (size_t i = 0; i < kPolicyResourcesSize; ++i) {
+    source->AddResourcePath(kPolicyResources[i].name,
+                            kPolicyResources[i].value);
+  }
   source->SetDefaultResource(IDR_MD_POLICY_HTML);
-
   return source;
 }
 
-
-content::WebUIDataSource* CreatePolicyUIHtmlSource() {
-  content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(chrome::kChromeUIPolicyHost);
-  AddCommonLocalizedStringsToSource(source);
-  // Add required resources.
-  source->AddResourcePath("policy.css", IDR_POLICY_CSS);
-  source->AddResourcePath("policy.js", IDR_POLICY_JS);
-  source->AddResourcePath("uber_utils.js", IDR_UBER_UTILS_JS);
-  source->SetDefaultResource(IDR_POLICY_HTML);
-
-  return source;
-}
-
 // Formats the association state indicated by |data|. If |data| is NULL, the
 // state is considered to be UNMANAGED.
 base::string16 FormatAssociationState(const em::PolicyData* data) {
   if (data) {
     switch (data->state()) {
       case em::PolicyData::ACTIVE:
         return l10n_util::GetStringUTF16(IDS_POLICY_ASSOCIATION_STATE_ACTIVE);
       case em::PolicyData::UNMANAGED:
         return l10n_util::GetStringUTF16(
             IDS_POLICY_ASSOCIATION_STATE_UNMANAGED);
@@ skipping 230 matching lines @@
 #endif
 
   // policy::PolicyService::Observer implementation.
   void OnPolicyUpdated(const policy::PolicyNamespace& ns,
                        const policy::PolicyMap& previous,
                        const policy::PolicyMap& current) override;
 
   // policy::SchemaRegistry::Observer implementation.
   void OnSchemaRegistryUpdated(bool has_new_schemas) override;
 
+ protected:
+  virtual void AddPolicyName(const std::string& name,
+                             base::DictionaryValue* names) const;
+
+  // Send a dictionary containing the names of all known policies to the UI.
+  virtual void SendPolicyNames() const;
+
  private:
-  // Send a dictionary containing the names of all known policies to the UI.
-  void SendPolicyNames() const;
-
   // Send information about the current policy values to the UI. For each policy
   // whose value has been set, a dictionary containing the value and additional
   // metadata is sent.
   void SendPolicyValues() const;
 
   // Send the status of cloud policy to the UI. For each scope that has cloud
   // policy enabled (device and/or user), a dictionary containing status
   // information is sent.
   void SendStatus() const;
 
@@ skipping 18 matching lines @@
   // respectively. These are created on initialization time as appropriate for
   // the platform (Chrome OS / desktop) and type of policy that is in effect.
   scoped_ptr<CloudPolicyStatusProvider> user_status_provider_;
   scoped_ptr<CloudPolicyStatusProvider> device_status_provider_;
 
   base::WeakPtrFactory<PolicyUIHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyUIHandler);
 };
 
+// The JavaScript message handler for the chrome://md-policy page.
+class PolicyMaterialDesignUIHandler : public PolicyUIHandler {

[Dan Beam, 2015/10/14 21:00:40]

why is this class not in it's own file[s]?

[fhorschig, 2015/10/15 14:45:38]

A justified question. It seems to be usual to have declaration and
implementation of simpler UiHandlers within a single file. I would propose to
apply this refactoring in case the PolicyMaterialDesignUiHandler gets more
complex. Currently, I wouldn't see enough benefit to do so (mainly because of
shared functionality).

[Dan Beam, 2015/10/15 16:55:03]

it seems far more "usual" to have 1 class per file

[fhorschig, 2015/10/22 14:47:08]

There is now a separate class for PolicyMaterialDesignUi and the
PolicyUiHandler. The latter one contains shared information, so it makes sense
to put it into a separate file. As most other WebUi children do, the
implementation of the handler (which doesn't share any information) is still
defined and implemented in the source file.

This should make the code much more cleaner but if you would prefer to create
even more separate files, please mention it and I will have another look into
this. I am not entirely sure how the threshold of "too many files versus too
huge files" is set for this project. (Also it reduces the potential pollution of
the global namespace to have handlers and ui in separate files ... so I am
really not sure.) 

+ public:
+  PolicyMaterialDesignUIHandler();
+  ~PolicyMaterialDesignUIHandler() override;
+
+ protected:
+  // PolicyUIHandler:
+  void AddPolicyName(const std::string& name,
+                     base::DictionaryValue* names) const override;
+  void SendPolicyNames() const override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PolicyMaterialDesignUIHandler);
+};
+
 CloudPolicyStatusProvider::CloudPolicyStatusProvider() {
 }
 
 CloudPolicyStatusProvider::~CloudPolicyStatusProvider() {
 }
 
 void CloudPolicyStatusProvider::SetStatusChangeCallback(
     const base::Closure& callback) {
   callback_ = callback;
 }
@@ skipping 208 matching lines @@
     SendPolicyValues();
   }
 }
 
 void PolicyUIHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                       const policy::PolicyMap& previous,
                                       const policy::PolicyMap& current) {
   SendPolicyValues();
 }
 
+void PolicyUIHandler::AddPolicyName(const std::string& name,
+                                    base::DictionaryValue* names) const {
+    names->SetBoolean(name, true);
+}
+
 void PolicyUIHandler::SendPolicyNames() const {
   base::DictionaryValue names;
 
   Profile* profile = Profile::FromWebUI(web_ui());
   policy::SchemaRegistry* registry =
       policy::SchemaRegistryServiceFactory::GetForContext(
           profile->GetOriginalProfile())->registry();
   scoped_refptr<policy::SchemaMap> schema_map = registry->schema_map();
 
   // Add Chrome policy names.
   base::DictionaryValue* chrome_policy_names = new base::DictionaryValue;
   policy::PolicyNamespace chrome_ns(policy::POLICY_DOMAIN_CHROME, "");
   const policy::Schema* chrome_schema = schema_map->GetSchema(chrome_ns);
   for (policy::Schema::Iterator it = chrome_schema->GetPropertiesIterator();
        !it.IsAtEnd(); it.Advance()) {
-    chrome_policy_names->SetBoolean(it.key(), true);
+    AddPolicyName(it.key(), chrome_policy_names);
   }
   names.Set("chromePolicyNames", chrome_policy_names);
 
 #if defined(ENABLE_EXTENSIONS)
   // Add extension policy names.
   base::DictionaryValue* extension_policy_names = new base::DictionaryValue;
 
   for (const scoped_refptr<const extensions::Extension>& extension :
        extensions::ExtensionRegistry::Get(profile)->enabled_extensions()) {
     // Skip this extension if it's not an enterprise extension.
@@ skipping 149 matching lines @@
 
 void PolicyUIHandler::OnRefreshPoliciesDone() const {
   web_ui()->CallJavascriptFunction("policy.Page.reloadPoliciesDone");
 }
 
 policy::PolicyService* PolicyUIHandler::GetPolicyService() const {
   return policy::ProfilePolicyConnectorFactory::GetForBrowserContext(
              web_ui()->GetWebContents()->GetBrowserContext())->policy_service();
 }
 
+PolicyMaterialDesignUIHandler::PolicyMaterialDesignUIHandler() {
+}
+
+PolicyMaterialDesignUIHandler::~PolicyMaterialDesignUIHandler() {
+}
+
+void PolicyMaterialDesignUIHandler::AddPolicyName(
+    const std::string& name, base::DictionaryValue* names) const {
+  scoped_ptr<base::ListValue> list(new base::ListValue());
+  const policy::RiskTag* tags = policy::GetChromePolicyDetails(name)->risk_tags;
+  for (size_t i = 0; i < policy::kMaxRiskTagCount; ++i) {
+    if (tags[i] != policy::RISK_TAG_NONE)
+      list->AppendString(kPolicyRiskTags[tags[i]].key);
+  }
+  names->Set(name, list.Pass());
+}
+
+void PolicyMaterialDesignUIHandler::SendPolicyNames() const {
+  base::ListValue tags;
+  for (size_t tag = 0; tag < policy::RISK_TAG_COUNT; ++tag)
+    tags.AppendString(kPolicyRiskTags[tag].key);
+
+  web_ui()->CallJavascriptFunction("policy.Page.setPolicyGroups", tags);
+  PolicyUIHandler::SendPolicyNames();
+}
+
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyUIHtmlSource());
 }
 
 PolicyUI::~PolicyUI() {
 }
 
 PolicyMaterialDesignUI::PolicyMaterialDesignUI(content::WebUI* web_ui) :
     WebUIController(web_ui) {
-  web_ui->AddMessageHandler(new PolicyUIHandler);
+  web_ui->AddMessageHandler(new PolicyMaterialDesignUIHandler);
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui),
                                 CreatePolicyMaterialDesignUIHtmlSource());
 }
 
 PolicyMaterialDesignUI::~PolicyMaterialDesignUI() {
 }