Identify and repair ONC files with duplicate GUIDs

chromeos/network/onc/onc_validator.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_ONC_ONC_VALIDATOR_H_
 #define CHROMEOS_NETWORK_ONC_ONC_VALIDATOR_H_
 
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/onc/onc_mapper.h"
 #include "components/onc/onc_constants.h"
 
 namespace base {
 class DictionaryValue;
@@ skipping 149 matching lines @@
   bool FieldExistsAndIsNotInRange(const base::DictionaryValue& object,
                                   const std::string &field_name,
                                   int lower_bound,
                                   int upper_bound);
 
   bool FieldExistsAndIsEmpty(const base::DictionaryValue& object,
                              const std::string& field_name);
 
   bool RequireField(const base::DictionaryValue& dict, const std::string& key);
 
+  bool VerifyGuidUniqueAndAddToHash(const base::DictionaryValue& dict,

[pneubeck (no reviews), 2014/02/17 10:11:36]

Hash -> Set ?

Add a comment that explains when it returns true/false.
yes, the above functions are missing comments as well ;-) but for some it's
obvious when they return what.

Instead of "Verify" you could also use something that better indicates the
meaning of the result, like "GuidIsUnique...."

[kaliamoorthi, 2014/02/17 15:06:49]

Done.

+                                    const std::string& kGUID,
+                                    std::set<std::string> *guids);
+
   // Prohibit certificate patterns for device policy ONC so that an unmanaged
   // user won't have a certificate presented for them involuntarily.
   bool IsCertPatternInDevicePolicy(const std::string& cert_type);
 
   // Prohibit global network configuration in user ONC imports.
   bool IsGlobalNetworkConfigInUserImport(
       const base::DictionaryValue& onc_object);
 
   std::string MessageHeader();
 
   const bool error_on_unknown_field_;
   const bool error_on_wrong_recommended_;
   const bool error_on_missing_field_;
   const bool managed_onc_;
 
   ::onc::ONCSource onc_source_;
 
   // The path of field names and indices to the current value. Indices
   // are stored as strings in decimal notation.
   std::vector<std::string> path_;
 
+  std::set<std::string> network_guids_;

[pneubeck (no reviews), 2014/02/17 10:11:36]

add comments like:

Accumulates all network GUIDs during validation. Used to identify duplicate
GUIDs.

[kaliamoorthi, 2014/02/17 15:06:49]

Done.

+  std::set<std::string> certificate_guids_;
+
   // Tracks if an error or warning occurred within validation initiated by
   // function ValidateAndRepairObject.
   bool error_or_warning_found_;
 
   DISALLOW_COPY_AND_ASSIGN(Validator);
 };
 
 }  // namespace onc
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_VALIDATOR_H_