Change Origin bound certs -> Domain bound certs.

net/base/origin_bound_cert_service.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 "net/base/origin_bound_cert_service.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/threading/worker_pool.h"
 #include "crypto/ec_private_key.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/origin_bound_cert_store.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/base/x509_certificate.h"
 #include "net/base/x509_util.h"
 
 #if defined(USE_NSS)
 #include <private/pprthred.h>  // PR_DetachThread
 #endif
 
@@ skipping 59 matching lines @@
   std::string* private_key_;
   std::string* cert_;
 };
 
 // OriginBoundCertServiceWorker runs on a worker thread and takes care of the
 // blocking process of performing key generation. Deletes itself eventually
 // if Start() succeeds.
 class OriginBoundCertServiceWorker {
  public:
   OriginBoundCertServiceWorker(
-      const std::string& origin,
+      const std::string& domain,
       SSLClientCertType type,
       OriginBoundCertService* origin_bound_cert_service)
-      : origin_(origin),
+      : domain_(domain),
         type_(type),
         serial_number_(base::RandInt(0, std::numeric_limits<int>::max())),
         origin_loop_(MessageLoop::current()),
         origin_bound_cert_service_(origin_bound_cert_service),
         canceled_(false),
         error_(ERR_FAILED) {
   }
 
   bool Start() {
     DCHECK_EQ(MessageLoop::current(), origin_loop_);
 
     return base::WorkerPool::PostTask(
         FROM_HERE,
         base::Bind(&OriginBoundCertServiceWorker::Run, base::Unretained(this)),
         true /* task is slow */);
   }
 
   // Cancel is called from the origin loop when the OriginBoundCertService is
   // getting deleted.
   void Cancel() {
     DCHECK_EQ(MessageLoop::current(), origin_loop_);
     base::AutoLock locked(lock_);
     canceled_ = true;
   }
 
  private:
   void Run() {
     // Runs on a worker thread.
-    error_ = OriginBoundCertService::GenerateCert(origin_,
+    error_ = OriginBoundCertService::GenerateCert(domain_,
                                                   type_,
                                                   serial_number_,
                                                   &creation_time_,
                                                   &expiration_time_,
                                                   &private_key_,
                                                   &cert_);
 #if defined(USE_NSS)
     // Detach the thread from NSPR.
     // Calling NSS functions attaches the thread to NSPR, which stores
     // the NSPR thread ID in thread-specific data.
@@ skipping 10 matching lines @@
   void DoReply() {
     DCHECK_EQ(MessageLoop::current(), origin_loop_);
     {
       // We lock here because the worker thread could still be in Finished,
       // after the PostTask, but before unlocking |lock_|. If we do not lock in
       // this case, we will end up deleting a locked Lock, which can lead to
       // memory leaks or worse errors.
       base::AutoLock locked(lock_);
       if (!canceled_) {
         origin_bound_cert_service_->HandleResult(
-            origin_, error_, type_, creation_time_, expiration_time_,
+            domain_, error_, type_, creation_time_, expiration_time_,
             private_key_, cert_);
       }
     }
     delete this;
   }
 
   void Finish() {
     // Runs on the worker thread.
     // We assume that the origin loop outlives the OriginBoundCertService. If
     // the OriginBoundCertService is deleted, it will call Cancel on us. If it
@@ skipping 11 matching lines @@
       if (!canceled) {
         origin_loop_->PostTask(
             FROM_HERE, base::Bind(&OriginBoundCertServiceWorker::DoReply,
                                   base::Unretained(this)));
       }
     }
     if (canceled)
       delete this;
   }
 
-  const std::string origin_;
+  const std::string domain_;
   const SSLClientCertType type_;
   // Note that serial_number_ must be initialized on a non-worker thread
   // (see documentation for OriginBoundCertService::GenerateCert).
   uint32 serial_number_;
   MessageLoop* const origin_loop_;
   OriginBoundCertService* const origin_bound_cert_service_;
 
   // lock_ protects canceled_.
   base::Lock lock_;
 
@@ skipping 106 matching lines @@
     RequestHandle* out_req) {
   DCHECK(CalledOnValidThread());
 
   *out_req = NULL;
 
   if (callback.is_null() || !private_key || !cert || origin.empty() ||
       requested_types.empty()) {
     return ERR_INVALID_ARGUMENT;
   }
 
+  std::string domain = GetDomainForHost(GURL(origin).host());

[wtc, 2012/03/08 02:13:45]

Should we also check domain.empty()?  See the origin.empty()
check at line 319 above.

[mattm, 2012/03/15 01:48:44]

Done.

+
   SSLClientCertType preferred_type = CLIENT_CERT_INVALID_TYPE;
   for (size_t i = 0; i < requested_types.size(); ++i) {
     if (IsSupportedCertType(requested_types[i])) {
       preferred_type = static_cast<SSLClientCertType>(requested_types[i]);
       break;
     }
   }
   if (preferred_type == CLIENT_CERT_INVALID_TYPE) {
     // None of the requested types are supported.
     return ERR_CLIENT_AUTH_CERT_TYPE_UNSUPPORTED;
   }
 
   requests_++;
 
-  // Check if an origin bound cert of an acceptable type already exists for this
-  // origin, and that it has not expired.
+  // Check if a domain bound cert of an acceptable type already exists for this
+  // domain, and that it has not expired.
   base::Time now = base::Time::Now();
   base::Time creation_time;
   base::Time expiration_time;
-  if (origin_bound_cert_store_->GetOriginBoundCert(origin,
+  if (origin_bound_cert_store_->GetOriginBoundCert(domain,
                                                    type,
                                                    &creation_time,
                                                    &expiration_time,
                                                    private_key,
                                                    cert)) {
     if (expiration_time < now) {
-      DVLOG(1) << "Cert store had expired cert for " << origin;
+      DVLOG(1) << "Cert store had expired cert for " << domain;
     } else if (!IsSupportedCertType(*type) ||
                std::find(requested_types.begin(), requested_types.end(),
                          *type) == requested_types.end()) {
       DVLOG(1) << "Cert store had cert of wrong type " << *type << " for "
-               << origin;
+               << domain;
     } else {
       cert_store_hits_++;
       return OK;
     }
   }
 
-  // |origin_bound_cert_store_| has no cert for this origin. See if an
+  // |origin_bound_cert_store_| has no cert for this domain. See if an
   // identical request is currently in flight.
   OriginBoundCertServiceJob* job = NULL;
   std::map<std::string, OriginBoundCertServiceJob*>::const_iterator j;
-  j = inflight_.find(origin);
+  j = inflight_.find(domain);
   if (j != inflight_.end()) {
     // An identical request is in flight already. We'll just attach our
     // callback.
     job = j->second;
     // Check that the job is for an acceptable type of cert.
     if (std::find(requested_types.begin(), requested_types.end(), job->type())
         == requested_types.end()) {
       DVLOG(1) << "Found inflight job of wrong type " << job->type()
-               << " for " << origin;
+               << " for " << domain;
       // If we get here, the server is asking for different types of certs in
       // short succession.  This probably means the server is broken or
-      // misconfigured.  Since we only store one type of cert per origin, we
+      // misconfigured.  Since we only store one type of cert per domain, we
       // are unable to handle this well.  Just return an error and let the first
       // job finish.
       return ERR_ORIGIN_BOUND_CERT_GENERATION_TYPE_MISMATCH;
     }
     inflight_joins_++;
   } else {
     // Need to make a new request.
     OriginBoundCertServiceWorker* worker = new OriginBoundCertServiceWorker(
-            origin,
+            domain,
             preferred_type,
             this);
     job = new OriginBoundCertServiceJob(worker, preferred_type);
     if (!worker->Start()) {
       delete job;
       delete worker;
       // TODO(rkn): Log to the NetLog.
       LOG(ERROR) << "OriginBoundCertServiceWorker couldn't be started.";
       return ERR_INSUFFICIENT_RESOURCES;  // Just a guess.
     }
-    inflight_[origin] = job;
+    inflight_[domain] = job;
   }
 
   OriginBoundCertServiceRequest* request =
       new OriginBoundCertServiceRequest(callback, type, private_key, cert);
   job->AddRequest(request);
   *out_req = request;
   return ERR_IO_PENDING;
 }
 
 OriginBoundCertStore* OriginBoundCertService::GetCertStore() {
   return origin_bound_cert_store_.get();
 }
 
 // static
-int OriginBoundCertService::GenerateCert(const std::string& origin,
+int OriginBoundCertService::GenerateCert(const std::string& domain,
                                          SSLClientCertType type,
                                          uint32 serial_number,
                                          base::Time* creation_time,
                                          base::Time* expiration_time,
                                          std::string* private_key,
                                          std::string* cert) {
   base::Time now = base::Time::Now();
   base::Time not_valid_after =
       now + base::TimeDelta::FromDays(kValidityPeriodInDays);
   std::string der_cert;
   std::vector<uint8> private_key_info;
   switch (type) {
     case CLIENT_CERT_ECDSA_SIGN: {
       scoped_ptr<crypto::ECPrivateKey> key(crypto::ECPrivateKey::Create());
       if (!key.get()) {
         DLOG(ERROR) << "Unable to create key pair for client";
         return ERR_KEY_GENERATION_FAILED;
       }
       if (!x509_util::CreateOriginBoundCertEC(
           key.get(),
-          origin,
+          domain,
           serial_number,
           now,
           not_valid_after,
           &der_cert)) {
         DLOG(ERROR) << "Unable to create x509 cert for client";
         return ERR_ORIGIN_BOUND_CERT_GENERATION_FAILED;
       }
 
       if (!key->ExportEncryptedPrivateKey(
           kEPKIPassword, 1, &private_key_info)) {
@@ skipping 20 matching lines @@
 
 void OriginBoundCertService::CancelRequest(RequestHandle req) {
   DCHECK(CalledOnValidThread());
   OriginBoundCertServiceRequest* request =
       reinterpret_cast<OriginBoundCertServiceRequest*>(req);
   request->Cancel();
 }
 
 // HandleResult is called by OriginBoundCertServiceWorker on the origin message
 // loop. It deletes OriginBoundCertServiceJob.
-void OriginBoundCertService::HandleResult(const std::string& origin,
+void OriginBoundCertService::HandleResult(const std::string& domain,
                                           int error,
                                           SSLClientCertType type,
                                           base::Time creation_time,
                                           base::Time expiration_time,
                                           const std::string& private_key,
                                           const std::string& cert) {
   DCHECK(CalledOnValidThread());
 
   origin_bound_cert_store_->SetOriginBoundCert(
-      origin, type, creation_time, expiration_time, private_key, cert);
+      domain, type, creation_time, expiration_time, private_key, cert);
 
   std::map<std::string, OriginBoundCertServiceJob*>::iterator j;
-  j = inflight_.find(origin);
+  j = inflight_.find(domain);
   if (j == inflight_.end()) {
     NOTREACHED();
     return;
   }
   OriginBoundCertServiceJob* job = j->second;
   inflight_.erase(j);
 
   job->HandleResult(error, type, private_key, cert);
   delete job;
 }
 
 int OriginBoundCertService::cert_count() {
   return origin_bound_cert_store_->GetCertCount();
 }
 
 }  // namespace net