Extending ONC validator's logging. Completing toplevel validation.

chromeos/network/onc/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 "chromeos/network/onc/onc_utils.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "crypto/encryptor.h"
 #include "crypto/hmac.h"
 #include "crypto/symmetric_key.h"
 
 #define ONC_LOG_WARNING(message) NET_LOG_WARNING("ONC", message)
 #define ONC_LOG_ERROR(message) NET_LOG_ERROR("ONC", message)
 
 namespace chromeos {
 namespace onc {
 
 namespace {
 
 const char kUnableToDecrypt[] = "Unable to decrypt encrypted ONC";
 const char kUnableToDecode[] = "Unable to decode encrypted ONC";
 
 }  // namespace
 
+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 || !root->GetAsDictionary(&dict_ptr)) {
     ONC_LOG_ERROR("Invalid JSON Dictionary: " + error);
     delete root;
@@ skipping 17 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) {
 
     ONC_LOG_ERROR("Encrypted ONC malformed.");
     return scoped_ptr<base::DictionaryValue>();
   }
 
   if (hmac_method != encrypted::kSHA1 ||
       cipher != encrypted::kAES256 ||
       stretch_method != encrypted::kPBKDF2) {
     ONC_LOG_ERROR("Encrypted ONC unsupported encryption scheme.");
@@ skipping 77 matching lines @@
       return "none";
     case ONC_SOURCE_USER_IMPORT:
       return "user import";
   }
   NOTREACHED() << "unknown ONC source " << source;
   return "unknown";
 }
 
 }  // chromeos
 }  // onc