diff options
| -rw-r--r-- | chromeos/chromeos.gyp | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_tools.gypi | 19 | ||||
| -rw-r--r-- | chromeos/tools/onc_validator/OWNERS | 1 | ||||
| -rw-r--r-- | chromeos/tools/onc_validator/onc_validator.cc | 163 |
4 files changed, 186 insertions, 0 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index 0dcef26c..a3dc3de 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -6,6 +6,9 @@ 'variables': { 'chromium_code': 1, }, + 'includes': [ + 'chromeos_tools.gypi' + ], 'targets': [ { 'target_name': 'chromeos', diff --git a/chromeos/chromeos_tools.gypi b/chromeos/chromeos_tools.gypi new file mode 100644 index 0000000..b634240 --- /dev/null +++ b/chromeos/chromeos_tools.gypi @@ -0,0 +1,19 @@ +# Copyright (c) 2013 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. + +{ + 'targets' : [ + { + 'target_name': 'onc_validator', + 'type': 'executable', + 'dependencies': [ + '../base/base.gyp:base', + 'chromeos.gyp:chromeos', + ], + 'sources': [ + 'tools/onc_validator/onc_validator.cc', + ], + }, + ], +} diff --git a/chromeos/tools/onc_validator/OWNERS b/chromeos/tools/onc_validator/OWNERS new file mode 100644 index 0000000..713045b --- /dev/null +++ b/chromeos/tools/onc_validator/OWNERS @@ -0,0 +1 @@ +pneubeck@chromium.org diff --git a/chromeos/tools/onc_validator/onc_validator.cc b/chromeos/tools/onc_validator/onc_validator.cc new file mode 100644 index 0000000..944bf92 --- /dev/null +++ b/chromeos/tools/onc_validator/onc_validator.cc @@ -0,0 +1,163 @@ +// Copyright (c) 2011 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 <cstdio> +#include <iostream> + +#include "base/basictypes.h" +#include "base/command_line.h" +#include "base/file_path.h" +#include "base/json/json_file_value_serializer.h" +#include "base/logging.h" +#include "base/values.h" +#include "chromeos/network/onc/onc_signature.h" +#include "chromeos/network/onc/onc_validator.h" + +// Command line switches. +const char kSwitchErrorOnUnknownField[] = "error-on-unknown-field"; +const char kSwitchErrorOnWrongRecommended[] = "error-on-wrong-recommended"; +const char kSwitchErrorOnMissingField[] = "error-on-missing-field"; +const char kSwitchManagedOnc[] = "managed-onc"; +const char kSwitchUserPolicy[] = "user-policy"; +const char kSwitchDevicePolicy[] = "device-policy"; +const char kSwitchUserImport[] = "user-import"; + +const char* kSwitches[] = { + kSwitchErrorOnUnknownField, + kSwitchErrorOnWrongRecommended, + kSwitchErrorOnMissingField, + kSwitchManagedOnc, + kSwitchUserPolicy, + kSwitchDevicePolicy, + kSwitchUserImport +}; + +// Return codes. +enum ReturnCode { + kStatusValid = 0, + kStatusWarnings = 1, + kStatusInvalid = 2, + kStatusJsonError = 3, + kStatusArgumentError = 4, +}; + +const char kToplevelConfiguration[] = "ToplevelConfiguration"; +const char kNetworkConfiguration[] = "NetworkConfiguration"; +const char kCertificate[] = "Certificate"; +const char* kTypes[] = { + kToplevelConfiguration, + kNetworkConfiguration, + kCertificate +}; + +void PrintHelp() { + fprintf(stderr, + "Usage:\n" + " onc_validator [OPTION]... [TYPE] onc_file\n" + "\n" + "Valid TYPEs are:\n"); + for (size_t i = 0; i < arraysize(kTypes); ++i) + fprintf(stderr, " %s\n", kTypes[i]); + + fprintf(stderr, + "\n" + "Valid OPTIONs are:\n"); + for (size_t i = 0; i < arraysize(kSwitches); ++i) + fprintf(stderr, " --%s\n", kSwitches[i]); + + fprintf(stderr, + "\n" + "Exit status is one of:\n" + " %i File is valid without warnings.\n" + " %i File is valid with warnings,\n" + " i.e. there were errors which were degraded to warnings.\n" + " %i File is invalid.\n" + " %i File couldn't be read or is not a valid JSON dictionary.\n" + " %i Some command line arguments are wrong.\n", + kStatusValid, + kStatusWarnings, + kStatusInvalid, + kStatusJsonError, + kStatusArgumentError); +} + +scoped_ptr<base::DictionaryValue> ReadDictionary(std::string filename) { + FilePath path(filename); + JSONFileValueSerializer serializer(path); + serializer.set_allow_trailing_comma(true); + + base::DictionaryValue* dict = NULL; + + std::string json_error; + base::Value* value = serializer.Deserialize(NULL, &json_error); + if (!value) { + LOG(ERROR) << "Couldn't json-deserialize file '" << filename + << "': " << json_error; + return make_scoped_ptr(dict); + } + + if (!value->GetAsDictionary(&dict)) { + LOG(ERROR) << "File '" << filename + << "' does not contain a dictionary as expected, but type " + << value->GetType(); + } + + return make_scoped_ptr(dict); +} + +int main(int argc, const char* argv[]) { + CommandLine::Init(argc, argv); + + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); + CommandLine::StringVector args = command_line.GetArgs(); + if (args.size() != 2) { + PrintHelp(); + return kStatusArgumentError; + } + + scoped_ptr<base::DictionaryValue> onc_object = ReadDictionary(args[1]); + + if (!onc_object) + return kStatusJsonError; + + chromeos::onc::Validator validator( + command_line.HasSwitch(kSwitchErrorOnUnknownField), + command_line.HasSwitch(kSwitchErrorOnWrongRecommended), + command_line.HasSwitch(kSwitchErrorOnMissingField), + command_line.HasSwitch(kSwitchManagedOnc)); + + if (command_line.HasSwitch(kSwitchUserPolicy)) + validator.SetOncSource(chromeos::onc::ONC_SOURCE_USER_POLICY); + else if (command_line.HasSwitch(kSwitchDevicePolicy)) + validator.SetOncSource(chromeos::onc::ONC_SOURCE_DEVICE_POLICY); + else if (command_line.HasSwitch(kSwitchUserImport)) + validator.SetOncSource(chromeos::onc::ONC_SOURCE_USER_IMPORT); + + std::string type_arg(args[0]); + const chromeos::onc::OncValueSignature* signature = NULL; + if (type_arg == kToplevelConfiguration) { + signature = &chromeos::onc::kToplevelConfigurationSignature; + } else if (type_arg == kNetworkConfiguration) { + signature = &chromeos::onc::kNetworkConfigurationSignature; + } else if (type_arg == kCertificate) { + signature = &chromeos::onc::kCertificateSignature; + } else { + LOG(ERROR) << "Unknown ONC type '" << type_arg << "'"; + return kStatusArgumentError; + } + + chromeos::onc::Validator::Result result; + validator.ValidateAndRepairObject(signature, *onc_object, &result); + + switch(result) { + case chromeos::onc::Validator::VALID: + return kStatusValid; + case chromeos::onc::Validator::VALID_WITH_WARNINGS: + return kStatusWarnings; + case chromeos::onc::Validator::INVALID: + return kStatusInvalid; + default: + CHECK(false); + } +} |