Enable public key pinning of local trust anchors

components/cronet/android/api/src/org/chromium/net/CronetEngine.java

 // 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.
 
 package org.chromium.net;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.http.HttpResponseCache;
 import android.support.annotation.IntDef;
@@ skipping 83 matching lines @@
                 mExpirationDate = expirationDate;
             }
         }
 
         private static final Pattern INVALID_PKP_HOST_NAME = Pattern.compile("^[0-9\\.]*$");
 
         // Private fields are simply storage of configuration for the resulting CronetEngine.
         // See setters below for verbose descriptions.
         private final Context mContext;
         private final List<QuicHint> mQuicHints = new LinkedList<QuicHint>();
-        private final List<Pkp> mPkps = new LinkedList<Pkp>();
+        private final List<Pkp> mPkps = new LinkedList<>();
+        private boolean mPinLocalTrustAnchors = false;

[Ryan Sleevi, 2016/06/13 17:03:11]

STYLE suggestion: Keep this variable named consistently with the public API

[kapishnikov, 2016/06/15 00:56:20]

Done, following the existing pattern.

         private String mUserAgent;
         private String mStoragePath;
         private boolean mLegacyModeEnabled;
         private LibraryLoader mLibraryLoader;
         private String mLibraryName;
         private boolean mQuicEnabled;
         private boolean mHttp2Enabled;
         private boolean mSdchEnabled;
         private String mDataReductionProxyKey;
         private String mDataReductionProxyPrimaryProxy;
@@ skipping 419 matching lines @@
 
         /**
          * Returns list of public key pins.
          * @return list of public key pins.
          */
         List<Pkp> publicKeyPins() {
             return mPkps;
         }
 
         /**
+         * Enables or disables pinning of the local (user-level) trust anchors.
+         *
+         * @param value {@code true} to enable pinning, {@code false} to disable.
+         * @return the builder to facilitate chaining.
+         */
+        public Builder enableLocalTrustAnchorPinning(boolean value) {
+            mPinLocalTrustAnchors = value;
+            return this;
+        }
+
+        boolean localTrustAnchorsPinningEnabled() {

[Ryan Sleevi, 2016/06/13 17:03:11]

naming: I'm not sufficiently read on Java style, but is it common to have
asymmetric methods like this?

Wouldn't it be
enableLocalTrustAnchorPinning
localTrustAnchorPinningEnabled

?

That still feels asymmetric w/r/t how enable/Enabled fit, perhaps

setLocalTrustAnchorPinningEnabled
localTrustAnchorPinningEnabled

Which would match the C++ style.

[kapishnikov, 2016/06/15 00:56:20]

Point taken. I have followed the pattern how the other methods are named,
enableHTTP2/http2Enabled, enableQUIC/quicEnabled, etc. The getter methods are
not exposed to the client. I would like to keep it consistent. 

+            return mPinLocalTrustAnchors;
+        }
+
+        /**
          * Checks whether a given string represents a valid host name for PKP and converts it
          * to ASCII Compatible Encoding representation according to RFC 1122, RFC 1123 and
          * RFC 3490. This method is more restrictive than required by RFC 7469. Thus, a host
          * that contains digits and the dot character only is considered invalid.
          *
          * Note: Currently Cronet doesn't have native implementation of host name validation that
          *       can be used. There is code that parses a provided URL but doesn't ensure its
          *       correctness. The implementation relies on {@code getaddrinfo} function.
          *
          * @param hostName host name to check and convert.
@@ skipping 556 matching lines @@
      * @hide as it's a prototype.
      */
     public interface RequestFinishedListener { // TODO(klm): Add a convenience abstract class.
         /**
          * Invoked with request info.
          * @param requestInfo {@link UrlRequestInfo} for finished request.
          */
         void onRequestFinished(UrlRequestInfo requestInfo);
     }
 }