[Cronet] Public key pinning for Java API

components/cronet/url_request_context_config.cc

 // Copyright 2014 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 "components/cronet/url_request_context_config.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 85 matching lines @@
 
     double quic_packet_loss_threshold = 0.0;
     if (quic_args->GetDouble(kQuicPacketLossThreshold,
                              &quic_packet_loss_threshold)) {
       context_builder->set_quic_packet_loss_threshold(
           quic_packet_loss_threshold);
     }
   }
 }
 
+bool GetTimeFromDouble(const base::Value* json_value, base::Time* time) {
+  double time_double;
+  bool success = json_value->GetAsDouble(&time_double);
+  if (success) {
+    *time = base::Time::FromDoubleT(time_double);
+  }
+  return success;
+}
+
 }  // namespace
 
 #define DEFINE_CONTEXT_CONFIG(x) const char REQUEST_CONTEXT_CONFIG_##x[] = #x;
 #include "components/cronet/url_request_context_config_list.h"
 #undef DEFINE_CONTEXT_CONFIG
 
 URLRequestContextConfig::QuicHint::QuicHint() {
 }
 
 URLRequestContextConfig::QuicHint::~QuicHint() {
 }
 
 // static
 void URLRequestContextConfig::QuicHint::RegisterJSONConverter(
     base::JSONValueConverter<URLRequestContextConfig::QuicHint>* converter) {
   converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_QUIC_HINT_HOST,
                                  &URLRequestContextConfig::QuicHint::host);
   converter->RegisterIntField(
       REQUEST_CONTEXT_CONFIG_QUIC_HINT_PORT,
       &URLRequestContextConfig::QuicHint::port);
   converter->RegisterIntField(
       REQUEST_CONTEXT_CONFIG_QUIC_HINT_ALT_PORT,
       &URLRequestContextConfig::QuicHint::alternate_port);
 }
 
+URLRequestContextConfig::Pkp::Pkp() {}

[pauljensen, 2015/12/01 20:50:13]

add newline between braces to match line 121

[kapishnikov, 2015/12/02 22:11:37]

I am running "git cl format" and it moves the closing bracket back. It is
actually according to the Code Style Guide:
https://google.github.io/styleguide/cppguide.html#Class_Format

+
+URLRequestContextConfig::Pkp::~Pkp() {}

[pauljensen, 2015/12/01 20:50:13]

ditto

[kapishnikov, 2015/12/02 22:11:36]

Same here.

+
+// static
+void URLRequestContextConfig::Pkp::RegisterJSONConverter(
+    base::JSONValueConverter<URLRequestContextConfig::Pkp>* converter) {
+  converter->RegisterStringField(REQUEST_CONTEXT_CONFIG_PKP_HOST,
+                                 &URLRequestContextConfig::Pkp::host);
+  converter->RegisterRepeatedString(REQUEST_CONTEXT_CONFIG_PKP_PIN_HASHES,
+                                    &URLRequestContextConfig::Pkp::pin_hashes);
+  converter->RegisterBoolField(
+      REQUEST_CONTEXT_CONFIG_PKP_INCLUDE_SUBDOMAINS,
+      &URLRequestContextConfig::Pkp::include_subdomains);
+  converter->RegisterCustomValueField<base::Time>(
+      REQUEST_CONTEXT_CONFIG_PKP_EXPIRATION_DATE,
+      &URLRequestContextConfig::Pkp::expiration_date, &GetTimeFromDouble);
+}
+
 URLRequestContextConfig::URLRequestContextConfig() {}
 
 URLRequestContextConfig::~URLRequestContextConfig() {}
 
 bool URLRequestContextConfig::LoadFromJSON(const std::string& config_string) {
   scoped_ptr<base::Value> config_value = base::JSONReader::Read(config_string);
   if (!config_value || !config_value->IsType(base::Value::TYPE_DICTIONARY)) {
     DLOG(ERROR) << "Bad JSON: " << config_string;
     return false;
   }
@@ skipping 64 matching lines @@
       &URLRequestContextConfig::data_reduction_primary_proxy);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_FALLBACK_PROXY,
       &URLRequestContextConfig::data_reduction_fallback_proxy);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_SECURE_PROXY_CHECK_URL,
       &URLRequestContextConfig::data_reduction_secure_proxy_check_url);
   converter->RegisterStringField(
       REQUEST_CONTEXT_CONFIG_DATA_REDUCTION_PROXY_KEY,
       &URLRequestContextConfig::data_reduction_proxy_key);
+  converter->RegisterRepeatedMessage(REQUEST_CONTEXT_CONFIG_PKP_LIST,
+                                     &URLRequestContextConfig::pkp_list);
 
   // For Testing.
   converter->RegisterCustomField<scoped_ptr<net::CertVerifier>>(
       REQUEST_CONTEXT_CONFIG_MOCK_CERT_VERIFIER,
       &URLRequestContextConfig::mock_cert_verifier,
       &GetMockCertVerifierFromString);
 }
 
 }  // namespace cronet