Extending ONC validator's logging. Completing toplevel validation.

chrome/browser/chromeos/cros/network_library_impl_base.cc

Index: chrome/browser/chromeos/cros/network_library_impl_base.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index abb4008fd3fa0f0a311e8d45624c73402e9c06c4..768af924d1b0e5fe5e3ee7d049a360b7a4e15146 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -1025,6 +1025,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
                                              const std::string& passphrase,
                                              onc::ONCSource source,
                                              bool allow_web_trust_from_policy) {
+  VLOG(2) << __func__ << ": called on " << onc_blob;
   NetworkProfile* profile = NULL;
   bool from_policy = (source == onc::ONC_SOURCE_USER_POLICY ||
                       source == onc::ONC_SOURCE_DEVICE_POLICY);
@@ -1036,19 +1037,17 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
   if (from_policy) {
     profile = GetProfileForType(GetProfileTypeForSource(source));
     if (profile == NULL) {
-      DLOG(WARNING) << "Profile for ONC source "
-                    << onc::GetSourceAsString(source)
-                    << " doesn't exist.";
-      return false;
+      VLOG(2) << "Profile for ONC source " << onc::GetSourceAsString(source)
+              << " doesn't exist.";
+      return true;

[pastarmovj, 2012/12/13 10:15:44]

Is this correct change?

[pneubeck (no reviews), 2012/12/13 14:10:03]

Yes. That case occurs regularly (depending on which is loading faster: Chrome or
Shill) and shouldn't throw a warning or error (at the call site).

     }
   }
 
-  VLOG(2) << __func__ << ": called on " << onc_blob;
   scoped_ptr<base::DictionaryValue> root_dict =
       onc::ReadDictionaryFromJson(onc_blob);
   if (root_dict.get() == NULL) {
-    LOG(WARNING) << "ONC loaded from " << onc::GetSourceAsString(source)
-                 << " is not a valid JSON dictionary.";
+    LOG(ERROR) << "ONC loaded from " << onc::GetSourceAsString(source)
+               << " is not a valid JSON dictionary.";
     return false;
   }
 
@@ -1058,8 +1057,8 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
   if (onc_type == onc::kEncryptedConfiguration) {
     root_dict = onc::Decrypt(passphrase, *root_dict);
     if (root_dict.get() == NULL) {
-      LOG(WARNING) << "Couldn't decrypt the ONC from "
-                   << onc::GetSourceAsString(source);
+      LOG(ERROR) << "Couldn't decrypt the ONC from "
+                 << onc::GetSourceAsString(source);
       return false;
     }
   }
@@ -1072,13 +1071,17 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
                            from_policy);
 
   // Unknown fields are removed from the result.
+  onc::Validator::Result validation_result;
   root_dict = validator.ValidateAndRepairObject(
-      &onc::kUnencryptedConfigurationSignature,
-      *root_dict);
-
-  if (root_dict.get() == NULL) {
-    LOG(WARNING) << "ONC from source " << source
-                 << " is invalid and couldn't be repaired.";
+      &onc::kToplevelConfigurationSignature, *root_dict, &validation_result);
+
+  if (validation_result == onc::Validator::VALID_WITH_WARNINGS) {
+    LOG(WARNING) << "ONC from " << onc::GetSourceAsString(source)
+                 << " produced warnings.";
+  } else if (validation_result == onc::Validator::INVALID ||
+             root_dict.get() == NULL) {
+    LOG(ERROR) << "ONC from " << onc::GetSourceAsString(source)
+               << " is invalid and couldn't be repaired.";
     return false;
   }
 
@@ -1091,18 +1094,13 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
       onc::kNetworkConfigurations,
       &network_configs);
 
-  // At least one of NetworkConfigurations or Certificates is required.
-  LOG_IF(WARNING, (!has_network_configurations && !has_certificates))
-      << "ONC from source " << source
-      << " has neither NetworkConfigurations nor Certificates.";
-
   if (has_certificates) {
     VLOG(2) << "ONC file has " << certificates->GetSize() << " certificates";
 
     onc::CertificateImporter cert_importer(source, allow_web_trust_from_policy);
     if (cert_importer.ParseAndStoreCertificates(*certificates) !=
         onc::CertificateImporter::IMPORT_OK) {
-      LOG(WARNING) << "Cannot parse some of the certificates in the ONC from "
+      LOG(ERROR) << "Cannot parse some of the certificates in the ONC from "
                    << onc::GetSourceAsString(source);

[Joao da Silva, 2012/12/13 09:51:35]

nit: indent

[pastarmovj, 2012/12/13 10:15:44]

Align the <<

[pneubeck (no reviews), 2012/12/13 14:10:03]

Done.

[pneubeck (no reviews), 2012/12/13 14:10:03]

Done.

       return false;
     }
@@ -1123,8 +1121,8 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
       bool marked_for_removal = false;
       Network* network = parser.ParseNetwork(i, &marked_for_removal);
       if (!network) {
-        LOG(WARNING) << "Error during parsing network at index " << i
-                     << " from ONC source " << onc::GetSourceAsString(source);
+        LOG(ERROR) << "Error during ONC parsing network at index " << i

[pastarmovj, 2012/12/13 10:15:44]

Ditto.

[pneubeck (no reviews), 2012/12/13 14:10:03]

Done.

+                     << " from " << onc::GetSourceAsString(source);

[Joao da Silva, 2012/12/13 09:51:35]

nit: indent

[pneubeck (no reviews), 2012/12/13 14:10:03]

Done.

         return false;
       }
 
@@ -1195,8 +1193,8 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
         if (ethernet) {
           CallConfigureService(ethernet->unique_id(), &dict);
         } else {
-          DLOG(WARNING) << "Tried to import ONC with an Ethernet network when "
-                        << "there is no active Ethernet connection.";
+          LOG(WARNING) << "Tried to import ONC with an Ethernet network when "
+                       << "there is no active Ethernet connection.";
         }
       } else {
         CallConfigureService(network->unique_id(), &dict);