Introduce unit test for NSS OCSP/AIA fetching

net/ocsp/nss_ocsp_unittest.cc

Index: net/ocsp/nss_ocsp_unittest.cc
diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/ocsp/nss_ocsp_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5fedb3c51de6ff44d161fb40dcf9584759570362
--- /dev/null
+++ b/net/ocsp/nss_ocsp_unittest.cc
@@ -0,0 +1,153 @@
+// 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.
+
+#include "net/ocsp/nss_ocsp.h"
+
+#include <string>
+
+#include "base/file_util.h"
+#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/memory/ref_counted.h"
+#include "net/base/net_errors.h"
+#include "net/base/test_completion_callback.h"
+#include "net/base/test_data_directory.h"
+#include "net/cert/cert_status_flags.h"
+#include "net/cert/cert_verifier.h"
+#include "net/cert/cert_verify_proc.h"
+#include "net/cert/cert_verify_proc_nss.h"
+#include "net/cert/cert_verify_result.h"
+#include "net/cert/multi_threaded_cert_verifier.h"
+#include "net/cert/test_root_certs.h"
+#include "net/cert/x509_certificate.h"
+#include "net/test/cert_test_util.h"
+#include "net/url_request/url_request_filter.h"
+#include "net/url_request/url_request_test_job.h"
+#include "net/url_request/url_request_test_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace net {
+
+namespace {
+
+// Matches the caIssuers hostname from the generated certificate.
+const char kAiaHost[] = "aia-test.invalid";
+// Returning a single DER-encoded cert, so the mime-type must be
+// application/pkix-cert per RFC 5280.
+const char kAiaHeaders[] = "HTTP/1.1 200 OK\0"
+                           "Content-type: application/pkix-cert\0"
+                           "\0";
+
+class AiaResponseHandler : public net::URLRequestJobFactory::ProtocolHandler {
+ public:
+  AiaResponseHandler(const std::string& headers, const std::string& cert_data)
+      : headers_(headers), cert_data_(cert_data), request_count_(0) {}
+  virtual ~AiaResponseHandler() {}
+
+  // net::URLRequestJobFactory::ProtocolHandler implementation:
+  virtual net::URLRequestJob* MaybeCreateJob(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
+    ++const_cast<AiaResponseHandler*>(this)->request_count_;
+
+    return new net::URLRequestTestJob(
+        request, network_delegate, headers_, cert_data_, true);
+  }
+
+  int request_count() const { return request_count_; }
+
+ private:
+  std::string headers_;
+  std::string cert_data_;
+  int request_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(AiaResponseHandler);
+};
+
+}  // namespace
+
+class NssHttpTest : public ::testing::Test {
+ public:
+  NssHttpTest()
+      : context_(false),
+        verify_proc_(new CertVerifyProcNSS),
+        verifier_(new MultiThreadedCertVerifier(verify_proc_)) {
+  }
+  virtual ~NssHttpTest() {}
+
+  virtual void SetUp() {
+    std::string file_contents;
+    ASSERT_TRUE(file_util::ReadFileToString(
+        GetTestCertsDirectory().AppendASCII("aia-intermediate.der"),
+        &file_contents));
+    // Ownership of |handler_| is transferred to the URLRequestFilter, but
+    // hold onto the original pointer in order to access |request_count()|.
+    handler_ = new AiaResponseHandler(kAiaHeaders, file_contents);

[erikwright (departed), 2013/05/22 01:29:18]

nit: although more verbose, I do find it more correct (and self-documenting) to
assign to a local scoped_ptr, assign local_ptr.get() to the raw member, and then
.Pass() the local ptr to the filter.

The formal reason why it seems better is that over time, with the current
implementation, code might be introduced between lines 86 and 91 that could
cause the pointer to be leaked.

[Ryan Sleevi, 2013/05/22 21:16:47]

Fair point. Updated.

+
+    URLRequestFilter::GetInstance()->AddHostnameProtocolHandler(
+        "http",
+        kAiaHost,
+        scoped_ptr<URLRequestJobFactory::ProtocolHandler>(handler_));
+
+    SetURLRequestContextForNSSHttpIO(&context_);
+    EnsureNSSHttpIOInit();
+  }
+
+  virtual void TearDown() {
+    ShutdownNSSHttpIO();
+
+    URLRequestFilter::GetInstance()->RemoveHostnameHandler("http", kAiaHost);
+  }
+
+  CertVerifier* const verifier() const {
+    return verifier_.get();
+  }
+
+  int request_count() const {
+    return handler_->request_count();
+  }
+
+ protected:
+  const CertificateList empty_cert_list_;
+
+ private:
+  TestURLRequestContext context_;
+  AiaResponseHandler* handler_;
+  scoped_refptr<CertVerifyProc> verify_proc_;
+  scoped_ptr<CertVerifier> verifier_;
+};
+
+// Tests that when using NSS to verify certificates, and IO is enabled,
+// that a request to fetch missing intermediate certificates is
+// made successfully.
+TEST_F(NssHttpTest, TestAia) {
+  scoped_refptr<X509Certificate> test_cert(
+      ImportCertFromFile(GetTestCertsDirectory(), "aia-cert.pem"));
+  ASSERT_TRUE(test_cert.get());
+
+  scoped_refptr<X509Certificate> test_root(
+      ImportCertFromFile(GetTestCertsDirectory(), "aia-root.pem"));
+  ASSERT_TRUE(test_root.get());
+
+  ScopedTestRoot scoped_root(test_root);
+
+  CertVerifyResult verify_result;
+  TestCompletionCallback test_callback;
+  CertVerifier::RequestHandle request_handle;
+
+  int flags = CertVerifier::VERIFY_CERT_IO_ENABLED;
+  int error = verifier()->Verify(test_cert, "aia-host.invalid", flags, NULL,
+                                 &verify_result, test_callback.callback(),
+                                 &request_handle, BoundNetLog());
+  ASSERT_EQ(ERR_IO_PENDING, error);
+
+  error = test_callback.WaitForResult();
+
+  EXPECT_EQ(OK, error);
+
+  // Ensure that NSS made an AIA request for the missing intermediate.
+  EXPECT_LT(0, request_count());
+}
+
+}  // namespace net