Enable client certificate patterns in device ONC policy

chromeos/network/onc/onc_validator.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_validator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 283 matching lines @@
   const char* const kValidCertTypes[] = {kRef, kPattern};
   std::vector<const char*> valid_cert_types(toVector(kValidCertTypes));
   if (allow_cert_type_none)
     valid_cert_types.push_back(kClientCertTypeNone);
   if (FieldExistsAndHasNoValidValue(*result, kClientCertType, valid_cert_types))
     return false;
 
   std::string cert_type;
   result->GetStringWithoutPathExpansion(kClientCertType, &cert_type);
 
-  if (IsCertPatternInDevicePolicy(cert_type))
-    return false;
-
   bool all_required_exist = true;
 
   if (cert_type == kPattern)
     all_required_exist &= RequireField(*result, kClientCertPattern);
   else if (cert_type == kRef)
     all_required_exist &= RequireField(*result, kClientCertRef);
 
   return !error_on_missing_field_ || all_required_exist;
 }
 
@@ skipping 184 matching lines @@
     if (guids->count(guid) != 0) {
       error_or_warning_found_ = true;
       LOG(ERROR) << MessageHeader() << "Found a duplicate GUID " << guid << ".";
       return false;
     }
     guids->insert(guid);
   }
   return true;
 }
 
-bool Validator::IsCertPatternInDevicePolicy(const std::string& cert_type) {
-  if (cert_type == ::onc::client_cert::kPattern &&
-      onc_source_ == ::onc::ONC_SOURCE_DEVICE_POLICY) {
-    error_or_warning_found_ = true;
-    LOG(ERROR) << MessageHeader() << "Client certificate patterns are "
-               << "prohibited in ONC device policies.";
-    return true;
-  }
-  return false;
-}
-
 bool Validator::IsGlobalNetworkConfigInUserImport(
     const base::DictionaryValue& onc_object) {
   if (onc_source_ == ::onc::ONC_SOURCE_USER_IMPORT &&
       onc_object.HasKey(::onc::toplevel_config::kGlobalNetworkConfiguration)) {
     error_or_warning_found_ = true;
     LOG(ERROR) << MessageHeader() << "GlobalNetworkConfiguration is prohibited "
                << "in ONC user imports";
     return true;
   }
   return false;
@@ skipping 521 matching lines @@
 }
 
 std::string Validator::MessageHeader() {
   std::string path = path_.empty() ? "toplevel" : base::JoinString(path_, ".");
   std::string message = "At " + path + ": ";
   return message;
 }
 
 }  // namespace onc
 }  // namespace chromeos