Extending ONC validator's logging. Completing toplevel validation.

chrome/browser/chromeos/network_settings/onc_utils.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/chromeos/network_settings/onc_utils.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/onc_constants.h"
 #include "crypto/encryptor.h"
 #include "crypto/hmac.h"
 #include "crypto/symmetric_key.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 namespace onc {
 
+const char kEmptyUnencryptedConfiguration[] =
+    "{\"Type\":\"UnencryptedConfiguration\",\"NetworkConfigurations\":[],"
+    "\"Certificates\":[]}";
+
 scoped_ptr<base::DictionaryValue> ReadDictionaryFromJson(
     const std::string& json,
     std::string* error) {
   base::Value* root = base::JSONReader::ReadAndReturnError(
       json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, error);
 
   base::DictionaryValue* dict_ptr = NULL;
   if (root != NULL && !root->GetAsDictionary(&dict_ptr)) {
     if (error) {
       *error = l10n_util::GetStringUTF8(
@@ skipping 21 matching lines @@
   std::string ciphertext;
 
   if (!root.GetString(encrypted::kCiphertext, &ciphertext) ||
       !root.GetString(encrypted::kCipher, &cipher) ||
       !root.GetString(encrypted::kHMAC, &hmac) ||
       !root.GetString(encrypted::kHMACMethod, &hmac_method) ||
       !root.GetString(encrypted::kIV, &initial_vector) ||
       !root.GetInteger(encrypted::kIterations, &iterations) ||
       !root.GetString(encrypted::kSalt, &salt) ||
       !root.GetString(encrypted::kStretch, &stretch_method) ||
-      !root.GetString(encrypted::kType, &onc_type) ||
+      !root.GetString(kType, &onc_type) ||
       onc_type != kEncryptedConfiguration) {
     *error = l10n_util::GetStringUTF8(
         IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_MALFORMED);
     return scoped_ptr<base::DictionaryValue>();
   }
 
   if (hmac_method != encrypted::kSHA1 ||
       cipher != encrypted::kAES256 ||
       stretch_method != encrypted::kPBKDF2) {
     *error = l10n_util::GetStringUTF8(
@@ skipping 71 matching lines @@
       ReadDictionaryFromJson(plaintext, error);
   if (new_root.get() == NULL && error->empty()) {
     *error = l10n_util::GetStringUTF8(
         IDS_NETWORK_CONFIG_ERROR_NETWORK_PROP_DICT_MALFORMED);
   }
   return new_root.Pass();
 }
 
 }  // chromeos
 }  // onc