Moving ManagedNetworkConfigurationHandler to chromeos/.

chromeos/network/certificate_pattern.cc

Index: chromeos/network/certificate_pattern.cc
diff --git a/chrome/browser/chromeos/cros/certificate_pattern.cc b/chromeos/network/certificate_pattern.cc
similarity index 43%
rename from chrome/browser/chromeos/cros/certificate_pattern.cc
rename to chromeos/network/certificate_pattern.cc
index 78249bc82119602bd1d7c142b2f8f3fefa7eaed9..f2048e07a3102122531087bc6eebdccff5b38c4d 100644
--- a/chrome/browser/chromeos/cros/certificate_pattern.cc
+++ b/chromeos/network/certificate_pattern.cc
@@ -2,31 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros/certificate_pattern.h"
-
-#include <algorithm>
-#include <list>
-#include <string>
-#include <vector>
-
-#include <cert.h>
-#include <pk11pub.h>
+#include "chromeos/network/certificate_pattern.h"
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "net/base/net_errors.h"
-#include "net/cert/cert_database.h"
-#include "net/cert/nss_cert_database.h"
-#include "net/cert/x509_cert_types.h"
-#include "net/cert/x509_certificate.h"
-
-// To shorten some of those long lines below.
-using base::DictionaryValue;
-using base::ListValue;
-using std::find;
-using std::list;
-using std::string;
-using std::vector;
 
 namespace chromeos {
 
@@ -58,83 +37,16 @@ bool GetAsListOfStrings(const base::Value& value,
   return true;
 }
 
-ListValue* CreateListFromStrings(const vector<string>& strings) {
-  ListValue* new_list = new ListValue;
-  for (vector<string>::const_iterator iter = strings.begin();
+base::ListValue* CreateListFromStrings(
+    const std::vector<std::string>& strings) {
+  base::ListValue* new_list = new base::ListValue;
+  for (std::vector<std::string>::const_iterator iter = strings.begin();
        iter != strings.end(); ++iter) {
     new_list->Append(new StringValue(*iter));
   }
   return new_list;
 }
 
-// Functor to filter out non-matching issuers.
-class IssuerFilter {
- public:
-  explicit IssuerFilter(const IssuerSubjectPattern& issuer)
-    : issuer_(issuer) {}
-  bool operator()(const scoped_refptr<net::X509Certificate>& cert) const {
-    return !issuer_.Matches(cert.get()->issuer());
-  }
- private:
-  const IssuerSubjectPattern& issuer_;
-};
-
-// Functor to filter out non-matching subjects.
-class SubjectFilter {
- public:
-  explicit SubjectFilter(const IssuerSubjectPattern& subject)
-    : subject_(subject) {}
-  bool operator()(const scoped_refptr<net::X509Certificate>& cert) const {
-    return !subject_.Matches(cert.get()->subject());
-  }
- private:
-  const IssuerSubjectPattern& subject_;
-};
-
-// Functor to filter out certs that don't have private keys, or are invalid.
-class PrivateKeyFilter {
- public:
-  explicit PrivateKeyFilter(net::CertDatabase* cert_db) : cert_db_(cert_db) {}
-  bool operator()(const scoped_refptr<net::X509Certificate>& cert) const {
-    return cert_db_->CheckUserCert(cert.get()) != net::OK;
-  }
- private:
-  net::CertDatabase* cert_db_;
-};
-
-// Functor to filter out certs that don't have an issuer in the associated
-// IssuerCARef list.
-class IssuerCaRefFilter {
- public:
-  explicit IssuerCaRefFilter(const vector<string>& issuer_ca_ref_list)
-    : issuer_ca_ref_list_(issuer_ca_ref_list) {}
-  bool operator()(const scoped_refptr<net::X509Certificate>& cert) const {
-    // Find the certificate issuer for each certificate.
-    // TODO(gspencer): this functionality should be available from
-    // X509Certificate or NSSCertDatabase.
-    CERTCertificate* issuer_cert = CERT_FindCertIssuer(
-        cert.get()->os_cert_handle(), PR_Now(), certUsageAnyCA);
-
-    if (issuer_cert && issuer_cert->nickname) {
-      // Separate the nickname stored in the certificate at the colon, since
-      // NSS likes to store it as token:nickname.
-      const char* delimiter = ::strchr(issuer_cert->nickname, ':');
-      if (delimiter) {
-        delimiter++;  // move past the colon.
-        vector<string>::const_iterator pat_iter = issuer_ca_ref_list_.begin();
-        while (pat_iter != issuer_ca_ref_list_.end()) {
-          if (::strcmp(delimiter, pat_iter->c_str()) == 0)
-            return false;
-          ++pat_iter;
-        }
-      }
-    }
-    return true;
-  }
- private:
-  const vector<string>& issuer_ca_ref_list_;
-};
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -152,32 +64,6 @@ IssuerSubjectPattern::IssuerSubjectPattern() {}
 
 IssuerSubjectPattern::~IssuerSubjectPattern() {}
 
-bool IssuerSubjectPattern::Matches(const net::CertPrincipal& principal) const {
-  if (!common_name_.empty() && common_name_ != principal.common_name)
-    return false;
-
-  if (!locality_.empty() && locality_ != principal.locality_name)
-    return false;
-
-  if (!organization_.empty()) {
-    if (find(principal.organization_names.begin(),
-             principal.organization_names.end(), organization_) ==
-        principal.organization_names.end()) {
-      return false;
-    }
-  }
-
-  if (!organizational_unit_.empty()) {
-    if (find(principal.organization_unit_names.begin(),
-             principal.organization_unit_names.end(),
-             organizational_unit_) == principal.organization_unit_names.end()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 bool IssuerSubjectPattern::Empty() const {
   return common_name_.empty() &&
          locality_.empty() &&
@@ -192,8 +78,8 @@ void IssuerSubjectPattern::Clear() {
   organizational_unit_.clear();
 }
 
-DictionaryValue* IssuerSubjectPattern::CreateAsDictionary() const {
-  DictionaryValue* dict = new DictionaryValue;
+base::DictionaryValue* IssuerSubjectPattern::CreateAsDictionary() const {
+  base::DictionaryValue* dict = new base::DictionaryValue;
   if (!common_name_.empty())
     dict->SetString(kCommonNameKey, common_name_);
   if (!locality_.empty())
@@ -205,7 +91,8 @@ DictionaryValue* IssuerSubjectPattern::CreateAsDictionary() const {
   return dict;
 }
 
-bool IssuerSubjectPattern::CopyFromDictionary(const DictionaryValue& dict) {
+bool IssuerSubjectPattern::CopyFromDictionary(
+    const base::DictionaryValue& dict) {
   Clear();
   dict.GetString(kCommonNameKey, &common_name_);
   dict.GetString(kLocalityKey, &locality_);
@@ -239,67 +126,8 @@ void CertificatePattern::Clear() {
   enrollment_uri_list_.clear();
 }
 
-scoped_refptr<net::X509Certificate> CertificatePattern::GetMatch() const {
-  typedef list<scoped_refptr<net::X509Certificate> > CertificateStlList;
-
-  // Start with all the certs, and narrow it down from there.
-  net::CertificateList all_certs;
-  CertificateStlList matching_certs;
-  net::NSSCertDatabase::GetInstance()->ListCerts(&all_certs);
-
-  if (all_certs.empty())
-    return NULL;
-
-  for (net::CertificateList::iterator iter = all_certs.begin();
-       iter != all_certs.end(); ++iter) {
-    matching_certs.push_back(*iter);
-  }
-
-  // Strip off any certs that don't have the right issuer and/or subject.
-  if (!issuer_.Empty()) {
-    matching_certs.remove_if(IssuerFilter(issuer_));
-    if (matching_certs.empty())
-      return NULL;
-  }
-
-  if (!subject_.Empty()) {
-    matching_certs.remove_if(SubjectFilter(subject_));
-    if (matching_certs.empty())
-      return NULL;
-  }
-
-  if (!issuer_ca_ref_list_.empty()) {
-    matching_certs.remove_if(IssuerCaRefFilter(issuer_ca_ref_list_));
-    if (matching_certs.empty())
-      return NULL;
-  }
-
-  // Eliminate any certs that don't have private keys associated with
-  // them.  The CheckUserCert call in the filter is a little slow (because of
-  // underlying PKCS11 calls), so we do this last to reduce the number of times
-  // we have to call it.
-  PrivateKeyFilter private_filter(net::CertDatabase::GetInstance());
-  matching_certs.remove_if(private_filter);
-
-  if (matching_certs.empty())
-    return NULL;
-
-  // We now have a list of certificates that match the pattern we're
-  // looking for.  Now we find the one with the latest start date.
-  scoped_refptr<net::X509Certificate> latest(NULL);
-
-  // Iterate over the rest looking for the one that was issued latest.
-  for (CertificateStlList::iterator iter = matching_certs.begin();
-       iter != matching_certs.end(); ++iter) {
-    if (!latest.get() || (*iter)->valid_start() > latest->valid_start())
-      latest = *iter;
-  }
-
-  return latest;
-}
-
-DictionaryValue* CertificatePattern::CreateAsDictionary() const {
-  DictionaryValue* dict = new base::DictionaryValue;
+base::DictionaryValue* CertificatePattern::CreateAsDictionary() const {
+  base::DictionaryValue* dict = new base::DictionaryValue;
 
   if (!issuer_ca_ref_list_.empty())
     dict->Set(kIssuerCaRefKey, CreateListFromStrings(issuer_ca_ref_list_));
@@ -315,9 +143,9 @@ DictionaryValue* CertificatePattern::CreateAsDictionary() const {
   return dict;
 }
 
-bool CertificatePattern::CopyFromDictionary(const DictionaryValue &dict) {
-  const DictionaryValue* child_dict = NULL;
-  const ListValue* child_list = NULL;
+bool CertificatePattern::CopyFromDictionary(const base::DictionaryValue &dict) {
+  const base::DictionaryValue* child_dict = NULL;
+  const base::ListValue* child_list = NULL;
   Clear();
 
   // All of these are optional.