Bug fix in should_generate_certs option

httpproxy.py

@@ -365,9 +365,10 @@ def close_request(self, request):
 class HttpsProxyServer(HttpProxyServer):
   """SSL server that generates certs for each host."""
 
-  def __init__(self, http_archive_fetch, custom_handlers,
+  def __init__(self, real_dns_lookup, http_archive_fetch, custom_handlers,
                https_root_ca_cert_path, **kwargs):
     self.ca_cert_path = https_root_ca_cert_path
+    self._real_dns_lookup = real_dns_lookup
     self.HANDLER = sslproxy.wrap_handler(HttpArchiveHandler)
     HttpProxyServer.__init__(self, http_archive_fetch, custom_handlers,
                              is_ssl=True, protocol='HTTPS', **kwargs)
@@ -387,7 +388,8 @@ def get_certificate(self, host):
     if host in self._host_to_cert_map:
       return self._host_to_cert_map[host]
 
-    server_cert = self.http_archive_fetch.http_archive.get_server_cert(host)
+    host_ip = self._real_dns_lookup(host)
+    server_cert = self.http_archive_fetch.http_archive.get_server_cert(host_ip)
     if server_cert in self._server_cert_to_cert_map:
       cert = self._server_cert_to_cert_map[server_cert]
       self._host_to_cert_map[host] = cert

replay.py

@@ -129,7 +129,7 @@ def AddWebProxy(server_manager, options, host, real_dns_lookup, http_archive):
   if options.ssl:
     if options.should_generate_certs:
       server_manager.Append(
-          httpproxy.HttpsProxyServer, archive_fetch, custom_handlers,
+          httpproxy.HttpsProxyServer, real_dns_lookup, archive_fetch, custom_handlers,
           options.https_root_ca_cert_path, host=host, port=options.ssl_port,
           use_delays=options.use_server_delay, **options.shaping_http)
     else: