WKWebView: Added cert verification API to web controller.

ios/web/net/cert_verifier_block_adapter_unittest.cc

Index: ios/web/net/cert_verifier_block_adapter_unittest.cc
diff --git a/ios/web/net/cert_verifier_block_adapter_unittest.cc b/ios/web/net/cert_verifier_block_adapter_unittest.cc
index 1380045e16e79eee8386043d1cbf9474262a776e..22894ea74d3b783f1d7edc147ae42a8b35a87e8e 100644
--- a/ios/web/net/cert_verifier_block_adapter_unittest.cc
+++ b/ios/web/net/cert_verifier_block_adapter_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/test/ios/wait_util.h"
 #include "net/base/net_errors.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/crl_set.h"
 #include "net/cert/x509_certificate.h"
@@ -44,8 +45,11 @@ ACTION_P(SetVerifyResult, result) {
 }
 
 // Calls CompletionCallback to emulate CertVerifier behavior.
-ACTION(RunCallback) {
-  arg6.Run(0);
+ACTION_P(RunCallback, status) {
+  CompletionCallback callback = arg6;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    callback.Run(status);
+  });

[Ryan Sleevi, 2015/08/07 21:52:12]

This doesn't seem to be emulating CertVerifier behaviour, but your Adapter's
behaviour.

CertVerifier would use

base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, base::Bind(arg6,
status));

[Eugene But (OOO till 7-30), 2015/08/12 22:00:38]

Done.

 }
 
 }  // namespace
@@ -53,28 +57,22 @@ ACTION(RunCallback) {
 // Test fixture to test CertVerifierBlockAdapter class.
 class CertVerifierBlockAdapterTest : public PlatformTest {
  protected:
-  void SetUp() override {
-    PlatformTest::SetUp();
-
-    cert_ = new X509Certificate("test", "test", base::Time(), base::Time());
-    scoped_ptr<CertVerifierMock> cert_verifier_mock(new CertVerifierMock());
-    cert_verifier_mock_ = cert_verifier_mock.get();
-    test_adapter_.reset(
-        new CertVerifierBlockAdapter(cert_verifier_mock.Pass()));
-  }
+  CertVerifierBlockAdapterTest()
+      : cert_(new X509Certificate("test", "test", base::Time(), base::Time())),

[Ryan Sleevi, 2015/08/07 21:52:12]

You should not create certificates like this for tests.

This is a valid-only-for-certain-minimal-cases ctor that isn't compatible
(because it creates an invalid OSCertHandle). You should use ImportCertFromFile
to create a real X509Certificate.

[Eugene But (OOO till 7-30), 2015/08/12 22:00:38]

Done.

+        test_adapter_(
+            new CertVerifierBlockAdapter(&cert_verifier_mock_, &net_log_)) {}
 
   // Performs synchronous verification.
   void Verify(CertVerifierBlockAdapter::Params params,
-              scoped_ptr<net::CertVerifyResult>* result,
+              net::CertVerifyResult* result,
               int* status) {
     __block bool verification_completed = false;
-    test_adapter_->Verify(params,
-                          ^(scoped_ptr<net::CertVerifyResult> callback_result,
-                            int callback_status) {
-                            *result = callback_result.Pass();
-                            *status = callback_status;
-                            verification_completed = true;
-                          });
+    test_adapter_->Verify(
+        params, ^(net::CertVerifyResult callback_result, int callback_status) {
+          *result = callback_result;
+          *status = callback_status;
+          verification_completed = true;
+        });
     base::test::ios::WaitUntilCondition(^{
       return verification_completed;
     });
@@ -82,10 +80,12 @@ class CertVerifierBlockAdapterTest : public PlatformTest {
 
   // Fake certificate created for testing.
   scoped_refptr<X509Certificate> cert_;
+  // CertVerifier mock.
+  CertVerifierMock cert_verifier_mock_;
+  // NetLog object required by CertVerifierBlockAdapter.
+  NetLog net_log_;
   // Testable |CertVerifierBlockAdapter| object.
   scoped_ptr<CertVerifierBlockAdapter> test_adapter_;
-  // CertVerifier mock owned by |test_adapter_|.
-  CertVerifierMock* cert_verifier_mock_;
 };
 
 // Tests |Verify| with default params and synchronous verification.
@@ -93,22 +93,22 @@ TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndSync) {
   // Set up expectation.
   net::CertVerifyResult expectedResult;
   expectedResult.cert_status = net::CERT_STATUS_AUTHORITY_INVALID;
-  const int kExpectedStatus = 0;
-  EXPECT_CALL(*cert_verifier_mock_,
+  const int kExpectedStatus = OK;
+  EXPECT_CALL(cert_verifier_mock_,
               Verify(cert_.get(), kHostName, "", 0, nullptr, _, _, _, _))

[Ryan Sleevi, 2015/08/07 21:52:12]

These "" should be std::string() as well.

[Eugene But (OOO till 7-30), 2015/08/12 22:00:38]

Done.

       .Times(1)
       .WillOnce(testing::DoAll(SetVerifyResult(expectedResult),
                                testing::Return(kExpectedStatus)));
 
   // Call |Verify|.
-  scoped_ptr<CertVerifyResult> actualResult;
+  CertVerifyResult actualResult;
   int actualStatus = -1;
   CertVerifierBlockAdapter::Params params(cert_.get(), kHostName);
   Verify(params, &actualResult, &actualStatus);
 
   // Ensure that Verification results are correct.
   EXPECT_EQ(kExpectedStatus, actualStatus);
-  EXPECT_EQ(expectedResult.cert_status, actualResult->cert_status);
+  EXPECT_EQ(expectedResult.cert_status, actualResult.cert_status);
 }
 
 // Tests |Verify| with default params and asynchronous verification.
@@ -116,15 +116,16 @@ TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndAsync) {
   // Set up expectation.
   net::CertVerifyResult expectedResult;
   expectedResult.is_issued_by_known_root = true;
-  const int kExpectedStatus = 0;
-  EXPECT_CALL(*cert_verifier_mock_,
+  const int kExpectedStatus = OK;
+  EXPECT_CALL(cert_verifier_mock_,
               Verify(cert_.get(), kHostName, "", 0, nullptr, _, _, _, _))
       .Times(1)
-      .WillOnce(testing::DoAll(SetVerifyResult(expectedResult), RunCallback(),
+      .WillOnce(testing::DoAll(SetVerifyResult(expectedResult),
+                               RunCallback(kExpectedStatus),
                                testing::Return(ERR_IO_PENDING)));
 
   // Call |Verify|.
-  scoped_ptr<CertVerifyResult> actualResult;
+  CertVerifyResult actualResult;
   int actualStatus = -1;
   CertVerifierBlockAdapter::Params params(cert_.get(), kHostName);
   Verify(params, &actualResult, &actualStatus);
@@ -132,47 +133,75 @@ TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndAsync) {
   // Ensure that Verification results are correct.
   EXPECT_EQ(kExpectedStatus, actualStatus);
   EXPECT_EQ(expectedResult.is_issued_by_known_root,
-            actualResult->is_issued_by_known_root);
+            actualResult.is_issued_by_known_root);
+}
+
+// Tests |Verify| with invalid cert argument.
+TEST_F(CertVerifierBlockAdapterTest, InvalidCert) {
+  // Call |Verify|.
+  CertVerifyResult actualResult;
+  int actualStatus = -1;
+  CertVerifierBlockAdapter::Params params(nullptr, kHostName);
+  Verify(params, &actualResult, &actualStatus);
+
+  // Ensure that Verification results are correct.
+  EXPECT_EQ(ERR_INVALID_ARGUMENT, actualStatus);
+}
+
+// Tests |Verify| with invalid hostname argument.
+TEST_F(CertVerifierBlockAdapterTest, InvalidHostname) {
+  // Call |Verify|.
+  CertVerifyResult actualResult;
+  int actualStatus = -1;
+  CertVerifierBlockAdapter::Params params(cert_.get(), "");

[Ryan Sleevi, 2015/08/07 21:52:12]

std::string()

[Eugene But (OOO till 7-30), 2015/08/12 22:00:38]

Done.

+  Verify(params, &actualResult, &actualStatus);
+
+  // Ensure that Verification results are correct.
+  EXPECT_EQ(ERR_INVALID_ARGUMENT, actualStatus);
 }
 
-// Tests |Verify| with invalid arguments.
-TEST_F(CertVerifierBlockAdapterTest, InvalidParamsAndError) {
+// Tests |Verify| with synchronous error.
+TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndSyncError) {
   // Set up expectation.
-  const int kExpectedStatus = ERR_INVALID_ARGUMENT;
-  EXPECT_CALL(*cert_verifier_mock_,
-              Verify(nullptr, "", "", 0, nullptr, _, _, _, _))
+  const int kExpectedStatus = ERR_INSUFFICIENT_RESOURCES;
+  EXPECT_CALL(cert_verifier_mock_,
+              Verify(cert_.get(), kHostName, "", 0, nullptr, _, _, _, _))
       .Times(1)
       .WillOnce(testing::Return(kExpectedStatus));
 
   // Call |Verify|.
-  scoped_ptr<CertVerifyResult> actualResult;
+  CertVerifyResult actualResult;
   int actualStatus = -1;
-  CertVerifierBlockAdapter::Params params(nullptr, "");
+  CertVerifierBlockAdapter::Params params(cert_.get(), kHostName);
   Verify(params, &actualResult, &actualStatus);
 
   // Ensure that Verification results are correct.
   EXPECT_EQ(kExpectedStatus, actualStatus);
-  EXPECT_FALSE(actualResult);
 }
 
-// Tests |Verify| with error.
-TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndError) {
+// Tests |Verify| with asynchronous error.
+TEST_F(CertVerifierBlockAdapterTest, DefaultParamsAndAsyncError) {
   // Set up expectation.
-  const int kExpectedStatus = ERR_INSUFFICIENT_RESOURCES;
-  EXPECT_CALL(*cert_verifier_mock_,
+  net::CertVerifyResult expectedResult;
+  expectedResult.is_issued_by_known_root = true;
+  const int kExpectedStatus = ERR_ACCESS_DENIED;
+  EXPECT_CALL(cert_verifier_mock_,
               Verify(cert_.get(), kHostName, "", 0, nullptr, _, _, _, _))
       .Times(1)
-      .WillOnce(testing::Return(kExpectedStatus));
+      .WillOnce(testing::DoAll(SetVerifyResult(expectedResult),
+                               RunCallback(kExpectedStatus),
+                               testing::Return(ERR_IO_PENDING)));
 
   // Call |Verify|.
-  scoped_ptr<CertVerifyResult> actualResult;
+  CertVerifyResult actualResult;
   int actualStatus = -1;
   CertVerifierBlockAdapter::Params params(cert_.get(), kHostName);
   Verify(params, &actualResult, &actualStatus);
 
   // Ensure that Verification results are correct.
   EXPECT_EQ(kExpectedStatus, actualStatus);
-  EXPECT_FALSE(actualResult);
+  EXPECT_EQ(expectedResult.is_issued_by_known_root,
+            actualResult.is_issued_by_known_root);
 }
 
 // Tests |Verify| with all params and synchronous verification.
@@ -180,9 +209,9 @@ TEST_F(CertVerifierBlockAdapterTest, AllParamsAndSync) {
   // Set up expectation.
   net::CertVerifyResult expectedResult;
   expectedResult.verified_cert = cert_;
-  const int kExpectedStatus = 0;
+  const int kExpectedStatus = OK;
   scoped_refptr<CRLSet> crl_set(CRLSet::EmptyCRLSetForTesting());
-  EXPECT_CALL(*cert_verifier_mock_,
+  EXPECT_CALL(cert_verifier_mock_,
               Verify(cert_.get(), kHostName, kOcspResponse,
                      CertVerifier::VERIFY_EV_CERT, crl_set.get(), _, _, _, _))
       .Times(1)
@@ -190,7 +219,7 @@ TEST_F(CertVerifierBlockAdapterTest, AllParamsAndSync) {
                                testing::Return(kExpectedStatus)));
 
   // Call |Verify|.
-  scoped_ptr<CertVerifyResult> actualResult;
+  CertVerifyResult actualResult;
   int actualStatus = -1;
   CertVerifierBlockAdapter::Params params(cert_.get(), kHostName);
   params.ocsp_response = kOcspResponse;
@@ -200,7 +229,7 @@ TEST_F(CertVerifierBlockAdapterTest, AllParamsAndSync) {
 
   // Ensure that Verification results are correct.
   EXPECT_EQ(kExpectedStatus, actualStatus);
-  EXPECT_EQ(expectedResult.verified_cert, actualResult->verified_cert);
+  EXPECT_EQ(expectedResult.verified_cert, actualResult.verified_cert);
 }
 
 }  // namespace