Add support of getting all policies value without pretty print

Add a new |is_pretty_print| flag to GetAllPolicyValuesAsDictionary
and GetAllPolicyValuesAsJSON function. All JSON objects including JSON
policy values will not be pretty printed if the parameter is set to False.

This is mainly used by cloud reporting to reduce report size.

Bug: 935653
Change-Id: Iec94b27582758bcef866d69dbb8df561544ae95b
Reviewed-on: https://chromium-review.googlesource.com/c/1487511Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635231}

chrome/browser/chromeos/policy/system_log_uploader.cc

@@ -128,7 +128,7 @@ std::string SystemLogDelegate::GetPolicyAsJSON() {
   }
   return policy::GetAllPolicyValuesAsJSON(
       ProfileManager::GetActiveUserProfile(), include_user_policies,
-      true /* with_device_data */);
+      true /* with_device_data */, true /* is_pretty_print */);
 }
 
 void SystemLogDelegate::LoadSystemLogs(LogUploadCallback upload_callback) {

chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc

@@ -114,7 +114,7 @@ void AppendAdditionalBrowserInformation(em::ChromeDesktopReportRequest* request,
     request->mutable_browser_report()
         ->mutable_chrome_user_profile_reports(0)
         ->set_policy_data(
-            policy::GetAllPolicyValuesAsJSON(profile, true, false));
+            policy::GetAllPolicyValuesAsJSON(profile, true, false, false));
 
     int64_t timestamp = GetMachineLevelUserCloudPolicyFetchTimestamp();
     if (timestamp > 0) {

chrome/browser/policy/policy_conversions.cc

@@ -75,10 +75,11 @@ const PolicyStringMap kPolicySources[policy::POLICY_SOURCE_COUNT] = {
 using PolicyToSchemaMap = base::flat_map<std::string, policy::Schema>;
 
 // Utility function that returns a JSON serialization of the given |dict|.
-std::string DictionaryToJSONString(const Value& dict) {
+std::string DictionaryToJSONString(const Value& dict, bool is_pretty_print) {
   std::string json_string;
   base::JSONWriter::WriteWithOptions(
-      dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
+      dict, (is_pretty_print ? base::JSONWriter::OPTIONS_PRETTY_PRINT : 0),
+      &json_string);
   return json_string;
 }
 
@@ -87,14 +88,15 @@ std::string DictionaryToJSONString(const Value& dict) {
 // i18n_template.js will display.
 Value CopyAndMaybeConvert(const Value& value,
                           bool convert_values,
-                          const base::Optional<policy::Schema>& schema) {
+                          const base::Optional<policy::Schema>& schema,
+                          bool is_pretty_print) {
   Value value_copy = value.Clone();
   if (schema.has_value())
     schema->MaskSensitiveValues(&value_copy);
   if (!convert_values)
     return value_copy;
   if (value_copy.is_dict())
-    return Value(DictionaryToJSONString(value_copy));
+    return Value(DictionaryToJSONString(value_copy, is_pretty_print));
 
   if (!value_copy.is_list()) {
     return value_copy;
@@ -103,7 +105,8 @@ Value CopyAndMaybeConvert(const Value& value,
   Value result(Value::Type::LIST);
   for (const auto& element : value_copy.GetList()) {
     if (element.is_dict()) {
-      result.GetList().emplace_back(Value(DictionaryToJSONString(element)));
+      result.GetList().emplace_back(
+          Value(DictionaryToJSONString(element, is_pretty_print)));
     } else {
       result.GetList().push_back(element.Clone());
     }
@@ -140,12 +143,14 @@ Value GetPolicyValue(
     const policy::PolicyMap::Entry& policy,
     policy::PolicyErrorMap* errors,
     bool convert_values,
-    const base::Optional<PolicyToSchemaMap>& known_policy_schemas) {
+    const base::Optional<PolicyToSchemaMap>& known_policy_schemas,
+    bool is_pretty_print) {
   base::Optional<policy::Schema> known_policy_schema =
       GetKnownPolicySchema(known_policy_schemas, policy_name);
   Value value(Value::Type::DICTIONARY);
-  value.SetKey("value", CopyAndMaybeConvert(*policy.value, convert_values,
-                                            known_policy_schema));
+  value.SetKey("value",
+               CopyAndMaybeConvert(*policy.value, convert_values,
+                                   known_policy_schema, is_pretty_print));
   value.SetKey(
       "scope",
       Value((policy.scope == policy::POLICY_SCOPE_USER) ? "user" : "machine"));
@@ -172,8 +177,9 @@ Value GetPolicyValue(
   if (!policy.conflicts.empty()) {
     Value conflict_values(Value::Type::LIST);
     for (const auto& conflict : policy.conflicts) {
-      base::Value conflicted_policy_value = GetPolicyValue(
-          policy_name, conflict, errors, convert_values, known_policy_schemas);
+      base::Value conflicted_policy_value =
+          GetPolicyValue(policy_name, conflict, errors, convert_values,
+                         known_policy_schemas, is_pretty_print);
       conflict_values.GetList().push_back(std::move(conflicted_policy_value));
     }
 
@@ -195,22 +201,25 @@ void GetPolicyValues(
     bool with_user_policies,
     bool convert_values,
     const base::Optional<PolicyToSchemaMap>& known_policy_schemas,
-    Value* values) {
+    Value* values,
+    bool is_pretty_print) {
   DCHECK(values);
   for (const auto& entry : map) {
     const std::string& policy_name = entry.first;
     const PolicyMap::Entry& policy = entry.second;
     if (policy.scope == policy::POLICY_SCOPE_USER && !with_user_policies)
       continue;
-    base::Value value = GetPolicyValue(policy_name, policy, errors,
-                                       convert_values, known_policy_schemas);
+    base::Value value =
+        GetPolicyValue(policy_name, policy, errors, convert_values,
+                       known_policy_schemas, is_pretty_print);
     values->SetKey(policy_name, std::move(value));
   }
 }
 
 base::Optional<PolicyToSchemaMap> GetKnownPolicies(
     const scoped_refptr<policy::SchemaMap> schema_map,
-    const PolicyNamespace& policy_namespace) {
+    const PolicyNamespace& policy_namespace,
+    bool is_pretty_print) {
   const Schema* schema = schema_map->GetSchema(policy_namespace);
   // There is no policy name verification without valid schema.
   if (!schema || !schema->valid())
@@ -231,7 +240,8 @@ base::Optional<PolicyToSchemaMap> GetKnownPolicies(
 void GetChromePolicyValues(content::BrowserContext* context,
                            bool keep_user_policies,
                            bool convert_values,
-                           Value* values) {
+                           Value* values,
+                           bool is_pretty_print) {
   policy::PolicyService* policy_service = GetPolicyService(context);
   policy::PolicyMap map;
 
@@ -262,14 +272,17 @@ void GetChromePolicyValues(content::BrowserContext* context,
   // Convert dictionary values to strings for display.
   handler_list->PrepareForDisplaying(&map);
 
-  GetPolicyValues(map, &errors, keep_user_policies, convert_values,
-                  GetKnownPolicies(schema_map, policy_namespace), values);
+  GetPolicyValues(
+      map, &errors, keep_user_policies, convert_values,
+      GetKnownPolicies(schema_map, policy_namespace, is_pretty_print), values,
+      is_pretty_print);
 }
 
 #if defined(OS_CHROMEOS)
 void GetDeviceLocalAccountPolicies(bool convert_values,
                                    Value* values,
-                                   bool with_device_data) {
+                                   bool with_device_data,
+                                   bool is_pretty_print) {
   // DeviceLocalAccount policies are only available for affiliated users and for
   // system logs.
   if (!with_device_data &&
@@ -327,9 +340,10 @@ void GetDeviceLocalAccountPolicies(bool convert_values,
     // Convert dictionary values to strings for display.
     handler_list->PrepareForDisplaying(&map);
 
-    GetPolicyValues(map, &errors, true, convert_values,
-                    GetKnownPolicies(schema_map, policy_namespace),
-                    &current_account_policies);
+    GetPolicyValues(
+        map, &errors, true, convert_values,
+        GetKnownPolicies(schema_map, policy_namespace, is_pretty_print),
+        &current_account_policies, is_pretty_print);
     values->SetKey(user_id, std::move(current_account_policies));
   }
 }
@@ -340,7 +354,8 @@ void GetDeviceLocalAccountPolicies(bool convert_values,
 Value GetAllPolicyValuesAsDictionary(content::BrowserContext* context,
                                      bool with_user_policies,
                                      bool convert_values,
-                                     bool with_device_data) {
+                                     bool with_device_data,
+                                     bool is_pretty_print) {
   Value all_policies(Value::Type::DICTIONARY);
   if (!context) {
     LOG(ERROR) << "Can not dump policies, null context";
@@ -352,7 +367,7 @@ Value GetAllPolicyValuesAsDictionary(content::BrowserContext* context,
   // Add Chrome policy values.
   Value chrome_policies(Value::Type::DICTIONARY);
   GetChromePolicyValues(context, with_user_policies, convert_values,
-                        &chrome_policies);
+                        &chrome_policies, is_pretty_print);
   all_policies.SetKey("chromePolicies", std::move(chrome_policies));
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -383,10 +398,11 @@ Value GetAllPolicyValuesAsDictionary(content::BrowserContext* context,
     policy::PolicyNamespace policy_namespace = policy::PolicyNamespace(
         policy::POLICY_DOMAIN_EXTENSIONS, extension->id());
     policy::PolicyErrorMap empty_error_map;
-    GetPolicyValues(GetPolicyService(context)->GetPolicies(policy_namespace),
-                    &empty_error_map, with_user_policies, convert_values,
-                    GetKnownPolicies(schema_map, policy_namespace),
-                    &extension_policies);
+    GetPolicyValues(
+        GetPolicyService(context)->GetPolicies(policy_namespace),
+        &empty_error_map, with_user_policies, convert_values,
+        GetKnownPolicies(schema_map, policy_namespace, is_pretty_print),
+        &extension_policies, is_pretty_print);
     extension_values.SetKey(extension->id(), std::move(extension_policies));
   }
   all_policies.SetKey("extensionPolicies", std::move(extension_values));
@@ -395,7 +411,7 @@ Value GetAllPolicyValuesAsDictionary(content::BrowserContext* context,
 #if defined(OS_CHROMEOS)
   Value device_local_account_policies(Value::Type::DICTIONARY);
   GetDeviceLocalAccountPolicies(convert_values, &device_local_account_policies,
-                                with_device_data);
+                                with_device_data, is_pretty_print);
   all_policies.SetKey("deviceLocalAccountPolicies",
                       std::move(device_local_account_policies));
 #endif  // defined(OS_CHROMEOS)
@@ -458,14 +474,15 @@ void FillIdentityFields(Value* policy_dump) {
 
 std::string GetAllPolicyValuesAsJSON(content::BrowserContext* context,
                                      bool with_user_policies,
-                                     bool with_device_data) {
+                                     bool with_device_data,
+                                     bool is_pretty_print) {
   Value all_policies = policy::GetAllPolicyValuesAsDictionary(
-      context, with_user_policies, false /* convert_values */,
-      with_device_data);
+      context, with_user_policies, false /* convert_values */, with_device_data,
+      is_pretty_print);
   if (with_device_data) {
     FillIdentityFields(&all_policies);
   }
-  return DictionaryToJSONString(all_policies);
+  return DictionaryToJSONString(all_policies, is_pretty_print);
 }
 
 }  // namespace policy

chrome/browser/policy/policy_conversions.h

@@ -20,19 +20,23 @@ namespace policy {
 // |with_device_data| governs if device identity data (e.g.
 // enrollment client ID) and device local accounts policies are included,
 // it is used in logs uploads to the server.
+// |is_pretty_print| govers if JSON policy value is pretty printed.
 base::Value GetAllPolicyValuesAsDictionary(content::BrowserContext* context,
                                            bool with_user_policies,
                                            bool convert_values,
-                                           bool with_device_data);
+                                           bool with_device_data,
+                                           bool is_pretty_print);
 
 // Returns a JSON with the values of all set policies.
 // |with_user_policies| governs if values with POLICY_SCOPE_USER are included.
 // |with_device_data| governs if device identity data (e.g.
 // enrollment client ID) and device local accounts policies are included,
 // it is used in logs uploads to the server.
+// |is_pretty_print| governs if the output is formatted.
 std::string GetAllPolicyValuesAsJSON(content::BrowserContext* context,
                                      bool with_user_policies,
-                                     bool with_device_data);
+                                     bool with_device_data,
+                                     bool is_pretty_print);
 
 }  // namespace policy
 

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -434,7 +434,8 @@ void NetInternalsMessageHandler::OnStoreDebugLogs(const base::ListValue* list) {
   base::FilePath policies_path = path.Append("policies.json");
   std::string json_policies = policy::GetAllPolicyValuesAsJSON(
       web_ui()->GetWebContents()->GetBrowserContext(),
-      true /* with_user_policies */, false /* with_device_data */);
+      true /* with_user_policies */, false /* with_device_data */,
+      true /* is_pretty_print */);
   base::PostTaskWithTraitsAndReply(
       FROM_HERE,
       {base::MayBlock(), base::TaskPriority::BEST_EFFORT,

chrome/browser/ui/webui/policy_ui_handler.cc

@@ -845,7 +845,7 @@ void PolicyUIHandler::SendPolicyValues() const {
   base::Value all_policies = policy::GetAllPolicyValuesAsDictionary(
       web_ui()->GetWebContents()->GetBrowserContext(),
       true /* with_user_policies */, true /* convert_values */,
-      false /* with_device_data */);
+      false /* with_device_data */, true /* is_pretty_print */);
   web_ui()->CallJavascriptFunctionUnsafe("policy.Page.setPolicyValues",
                                          all_policies);
 }
@@ -922,7 +922,8 @@ void PolicyUIHandler::WritePoliciesToJSONFile(
     const base::FilePath& path) const {
   std::string json_policies = policy::GetAllPolicyValuesAsJSON(
       web_ui()->GetWebContents()->GetBrowserContext(),
-      true /* with_user_policies */, false /* with_device_data */);
+      true /* with_user_policies */, false /* with_device_data */,
+      true /* is_pretty_print */);
 
   base::PostTaskWithTraits(
       FROM_HERE,