[polymer] Merge of master into polymer10-migration

telemetry/third_party/webpagereplay/httpclient.py

 #!/usr/bin/env python
 # Copyright 2012 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 182 matching lines @@
     else:
       httplib.HTTPSConnection.__init__(self, host=host, port=port)
 
 
 class RealHttpFetch(object):
 
   def __init__(self, real_dns_lookup):
     """Initialize RealHttpFetch.
 
     Args:
-      real_dns_lookup: a function that resolves a host to an IP.
+      real_dns_lookup: a function that resolves a host to an IP. RealHttpFetch
+        will resolve host name to the IP before making fetching request if this
+        is not None.
     """
     self._real_dns_lookup = real_dns_lookup
 
   @staticmethod
   def _GetHeaderNameValue(header):
     """Parse the header line and return a name/value tuple.
 
     Args:
       header: a string for a header such as "Content-Length: 314".
     Returns:
@@ skipping 74 matching lines @@
       A DetailedHTTPSConnection or DetailedHTTPConnection instance.
     """
     connection_host = request_host
     connection_port = request_port
     system_proxy = self._get_system_proxy(is_ssl)
     if system_proxy:
       connection_host = system_proxy.host
       connection_port = system_proxy.port
 
     # Use an IP address because WPR may override DNS settings.
-    connection_ip = self._real_dns_lookup(connection_host)
-    if not connection_ip:
-      logging.critical('Unable to find host ip for name: %s', connection_host)
-      return None
+    if self._real_dns_lookup:
+      connection_ip = self._real_dns_lookup(connection_host)
+      if not connection_ip:
+        logging.critical(
+            'Unable to find IP for host name: %s', connection_host)
+        return None
+      connection_host = connection_ip
 
     if is_ssl:
-      connection = DetailedHTTPSConnection(connection_ip, connection_port)
+      connection = DetailedHTTPSConnection(connection_host, connection_port)
       if system_proxy:
         connection.set_tunnel(request_host, request_port)
     else:
-      connection = DetailedHTTPConnection(connection_ip, connection_port)
+      connection = DetailedHTTPConnection(connection_host, connection_port)
     return connection
 
   def __call__(self, request):
     """Fetch an HTTP request.
 
     Args:
       request: an ArchivedHttpRequest
     Returns:
       an ArchivedHttpResponse
     """
@@ skipping 35 matching lines @@
           retries -= 1
           logging.warning('Retrying fetch %s: %s', request, repr(e))
           continue
         logging.critical('Could not fetch %s: %s', request, repr(e))
         return None
 
 
 class RecordHttpArchiveFetch(object):
   """Make real HTTP fetches and save responses in the given HttpArchive."""
 
-  def __init__(self, http_archive, real_dns_lookup, inject_script):
+  def __init__(self, http_archive, inject_script):
     """Initialize RecordHttpArchiveFetch.
 
     Args:
       http_archive: an instance of a HttpArchive
-      real_dns_lookup: a function that resolves a host to an IP.
       inject_script: script string to inject in all pages
     """
     self.http_archive = http_archive
-    self.real_http_fetch = RealHttpFetch(real_dns_lookup)
+    # Do not resolve host name to IP when recording to avoid SSL3 handshake
+    # failure.
+    # See https://github.com/chromium/web-page-replay/issues/73 for details.
+    self.real_http_fetch = RealHttpFetch(real_dns_lookup=None)
     self.inject_script = inject_script
 
   def __call__(self, request):
     """Fetch the request and return the response.
 
     Args:
       request: an ArchivedHttpRequest.
     Returns:
       an ArchivedHttpResponse
     """
@@ skipping 87 matching lines @@
       http_archive: an instance of a HttpArchive
       real_dns_lookup: a function that resolves a host to an IP.
       inject_script: script string to inject in all pages.
       use_diff_on_unknown_requests: If True, log unknown requests
         with a diff to requests that look similar.
       use_record_mode: If True, start in server in record mode.
       use_closest_match: If True, on replay mode, serve the closest match
         in the archive instead of giving a 404.
     """
     self.http_archive = http_archive
-    self.record_fetch = RecordHttpArchiveFetch(
-        http_archive, real_dns_lookup, inject_script)
+    self.record_fetch = RecordHttpArchiveFetch(http_archive, inject_script)
     self.replay_fetch = ReplayHttpArchiveFetch(
         http_archive, real_dns_lookup, inject_script,
         use_diff_on_unknown_requests, use_closest_match, scramble_images)
     if use_record_mode:
       self.SetRecordMode()
     else:
       self.SetReplayMode()
 
   def SetRecordMode(self):
     self.fetch = self.record_fetch
     self.is_record_mode = True
 
   def SetReplayMode(self):
     self.fetch = self.replay_fetch
     self.is_record_mode = False
 
   def __call__(self, *args, **kwargs):
     """Forward calls to Replay/Record fetch functions depending on mode."""
     return self.fetch(*args, **kwargs)