WKWebView: Added cert verification API to web controller.

ios/web/net/cert_verifier_block_adapter.h

 // Copyright 2015 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.
 
 #ifndef IOS_WEB_NET_CERT_VERIFIER_BLOCK_ADAPTER_H_
 #define IOS_WEB_NET_CERT_VERIFIER_BLOCK_ADAPTER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cert/cert_verify_result.h"
 #include "net/log/net_log.h"
 
 namespace net {
 
-class CertVerifyResult;
 class CRLSet;
 class X509Certificate;
 
 // Provides block-based interface for net::CertVerifier.
 class CertVerifierBlockAdapter {
  public:
-  CertVerifierBlockAdapter();
   // Constructs adapter with given |CertVerifier| which can not be null.
-  CertVerifierBlockAdapter(scoped_ptr<CertVerifier> cert_verifier);
+  // CertVerifierBlockAdapter does NOT take ownership over |cert_verifier|.
+  CertVerifierBlockAdapter(CertVerifier* cert_verifier);

[Ryan Sleevi, 2015/08/06 03:07:08]

BUG/STYLE: This should be explicit.

[Eugene But (OOO till 7-30), 2015/08/07 02:27:20]

Acknowledged. This constructor now accepts 2 arguments.

 
   // When the verifier is destroyed, all certificate verification requests are
   // canceled, and their completion handlers will not be called.
   ~CertVerifierBlockAdapter();
 
   // Encapsulates verification parms. |cert| and |hostname| are mandatory, the
   // other params are optional. If either of mandatory arguments is null or
   // empty then verification |CompletionHandler| will be called with
   // ERR_INVALID_ARGUMENT status.
   struct Params {
     // Constructs Params from X509 cert and hostname, which are mandatory for
     // verification.
     Params(scoped_refptr<net::X509Certificate> cert,
            const std::string& hostname);
     ~Params();
 
     // Certificate to verify, can not be null.
     scoped_refptr<net::X509Certificate> cert;
 
     // Hostname as an SSL server, can not be empty.
     std::string hostname;
 
     // If non-empty, is a stapled OCSP response to use.
     std::string ocsp_response;
 
     // Bitwise OR of CertVerifier::VerifyFlags.
     CertVerifier::VerifyFlags flags;

[Ryan Sleevi, 2015/08/06 03:07:09]

It's a bitwise or. It shouldn't be stored as an enum, but as an int.

[Eugene But (OOO till 7-30), 2015/08/07 02:27:20]

Done.

 
     // An optional CRLSet structure which can be used to avoid revocation checks
     // over the network.
     scoped_refptr<CRLSet> crl_set;
   };
 
-  // Type of verification completion block. On success CertVerifyResult is not
-  // null and status is OK, otherwise CertVerifyResult is null and status is a
-  // net error code.
-  typedef void (^CompletionHandler)(scoped_ptr<CertVerifyResult>, int status);
+  // Type of verification completion block. On success status is OK, otherwise
+  // status is a net error code and CertVerifyResult is not a valid object.
+  typedef void (^CompletionHandler)(CertVerifyResult, int status);

[Ryan Sleevi, 2015/08/06 03:07:09]

Do blocks not allow you to forward declare such structures?

[Eugene But (OOO till 7-30), 2015/08/07 02:27:20]

No you can't forward declare this block without including cert_verify_result.h,
because block takes CertVerifyResult by value.

 
   // Verifies certificate with given |params|. |completion_handler| must not be
   // null and call be called either syncronously (in the same runloop) or
   // asyncronously.
   void Verify(const Params& params, CompletionHandler completion_handler);
 
  private:
-  // Underlying CertVerifier.
-  scoped_ptr<CertVerifier> cert_verifier_;
+  // Underlying weak CertVerifier.

[Ryan Sleevi, 2015/08/06 03:07:08]

Weak has a particular meaning in Chromium (c.f. WeakPtr); this does not appear
to be a common term in Chromium code, although I'm guessing you're using the iOS
terminology.

[Eugene But (OOO till 7-30), 2015/08/07 02:27:20]

Good catch. Changed to "unowned", because this is not a weak pointer even by iOS
terminology.

+  CertVerifier* cert_verifier_;
   // Net Log required by CertVerifier.

[Ryan Sleevi, 2015/08/06 03:07:09]

This comment doesn't seem to help documentation much :/

Why are you creating your own NetLog? Why is the adapter-caller not supplying it
as part of the Params / Verify call?

   BoundNetLog net_log_;
 };
 
 }  // net
 
 #endif  // IOS_WEB_NET_CERT_VERIFIER_BLOCK_ADAPTER_H_