Fill in some necessary fields in web_view_url_request_context_getter to avoid crashes. Fixing this …

ios/web_view/internal/web_view_url_request_context_getter.mm

 // 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 "ios/web_view/internal/web_view_url_request_context_getter.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #import "ios/net/cookies/cookie_store_ios_persistent.h"
 #import "ios/web/public/web_client.h"
 #include "ios/web/public/web_thread.h"
 #include "ios/web_view/internal/web_view_network_delegate.h"
 #include "net/base/cache_type.h"
 #include "net/cert/cert_verifier.h"
+#include "net/cert/multi_log_ct_verifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/transport_security_persister.h"
 #include "net/http/transport_security_state.h"
 #include "net/proxy/proxy_config_service_ios.h"
 #include "net/proxy/proxy_service.h"
@@ skipping 60 matching lines @@
     storage_->set_http_user_agent_settings(
         base::MakeUnique<net::StaticHttpUserAgentSettings>("en-us,en",
                                                            user_agent));
     storage_->set_proxy_service(
         net::ProxyService::CreateUsingSystemProxyResolver(
             std::move(proxy_config_service_), 0,
             url_request_context_->net_log()));
     storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
 
-    std::unique_ptr<net::TransportSecurityState> transport_security_state =
-        base::MakeUnique<net::TransportSecurityState>();
-    storage_->set_transport_security_state(std::move(transport_security_state));
+    storage_->set_transport_security_state(
+        base::MakeUnique<net::TransportSecurityState>());
+    storage_->set_cert_transparency_verifier(
+        base::WrapUnique(new net::MultiLogCTVerifier));
+    storage_->set_ct_policy_enforcer(
+        base::WrapUnique(new net::CTPolicyEnforcer));
     transport_security_persister_.reset(new net::TransportSecurityPersister(
-        transport_security_state.get(), base_path_, file_task_runner_, false));
+        url_request_context_->transport_security_state(), base_path_,

[michaeldo, 2017/03/27 05:37:42]

Is there a reason to change this to use
|url_request_context_->transport_security_state()| instead of the same
transport_security_state passed to the storage object?

[jzw, 2017/03/27 09:04:40]

storage's set_transport_security_state calls std::move, which causes it that
unique_ptr to lose its content later on. but it turns out that method also sets
transport_security_state on the url_request_context, which is why i'm using it
here. i agree it does look a bit confusing, so if there's anyway i can make it
look better please let me know!

[michaeldo, 2017/03/27 23:03:46]

I see thank you for the explanation. Your implementation makes sense in this
case, thanks!

+        file_task_runner_, false));
     storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
         new net::DefaultChannelIDStore(nullptr)));
     storage_->set_http_server_properties(
         std::unique_ptr<net::HttpServerProperties>(
             new net::HttpServerPropertiesImpl()));
 
     std::unique_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(
             url_request_context_->net_log()));
     storage_->set_http_auth_handler_factory(
         net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
     storage_->set_host_resolver(std::move(host_resolver));
 
     net::HttpNetworkSession::Params network_session_params;
     network_session_params.cert_verifier =
         url_request_context_->cert_verifier();
     network_session_params.transport_security_state =
         url_request_context_->transport_security_state();
+    network_session_params.cert_transparency_verifier =
+        url_request_context_->cert_transparency_verifier();
     network_session_params.channel_id_service =
         url_request_context_->channel_id_service();
     network_session_params.net_log = url_request_context_->net_log();
     network_session_params.proxy_service =
         url_request_context_->proxy_service();
     network_session_params.ssl_config_service =
         url_request_context_->ssl_config_service();
     network_session_params.http_auth_handler_factory =
         url_request_context_->http_auth_handler_factory();
     network_session_params.http_server_properties =
         url_request_context_->http_server_properties();
     network_session_params.host_resolver =
         url_request_context_->host_resolver();
+    network_session_params.ct_policy_enforcer =
+        url_request_context_->ct_policy_enforcer();
 
     base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
     std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
         new net::HttpCache::DefaultBackend(net::DISK_CACHE,
                                            net::CACHE_BACKEND_DEFAULT,
                                            cache_path, 0, cache_task_runner_));
 
     storage_->set_http_network_session(
         base::MakeUnique<net::HttpNetworkSession>(network_session_params));
     storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
@@ skipping 11 matching lines @@
 
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 WebViewURLRequestContextGetter::GetNetworkTaskRunner() const {
   return network_task_runner_;
 }
 
 }  // namespace ios_web_view