mirror of
https://github.com/internetarchive/warcprox.git
synced 2025-01-18 13:22:09 +01:00
log remote host/ip/port on SSLError
This commit is contained in:
parent
fce1c3d722
commit
1aa6b0c5d6
2
setup.py
2
setup.py
@ -43,7 +43,7 @@ except:
|
||||
|
||||
setuptools.setup(
|
||||
name='warcprox',
|
||||
version='2.4.17',
|
||||
version='2.4.18',
|
||||
description='WARC writing MITM HTTP/S proxy',
|
||||
url='https://github.com/internetarchive/warcprox',
|
||||
author='Noah Levitt',
|
||||
|
@ -276,6 +276,8 @@ class MitmProxyHandler(http_server.BaseHTTPRequestHandler):
|
||||
host=self.hostname, port=int(self.port), scheme='http',
|
||||
pool_kwargs={'maxsize': 12, 'timeout': self._socket_timeout})
|
||||
|
||||
remote_ip = None
|
||||
|
||||
self._remote_server_conn = self._conn_pool._get_conn()
|
||||
if is_connection_dropped(self._remote_server_conn):
|
||||
if self.onion_tor_socks_proxy_host and self.hostname.endswith('.onion'):
|
||||
@ -291,6 +293,7 @@ class MitmProxyHandler(http_server.BaseHTTPRequestHandler):
|
||||
self._remote_server_conn.sock.connect((self.hostname, int(self.port)))
|
||||
else:
|
||||
self._remote_server_conn.connect()
|
||||
remote_ip = self._remote_server_conn.sock.getpeername()[0]
|
||||
|
||||
# Wrap socket if SSL is required
|
||||
if self.is_connect:
|
||||
@ -312,6 +315,11 @@ class MitmProxyHandler(http_server.BaseHTTPRequestHandler):
|
||||
"consider upgrading to python 2.7.9+ or 3.4+",
|
||||
self.hostname)
|
||||
raise
|
||||
except ssl.SSLError as e:
|
||||
self.logger.error(
|
||||
'error connecting to %s (%s) port %s: %s',
|
||||
self.hostname, remote_ip, self.port, e)
|
||||
raise
|
||||
return self._remote_server_conn.sock
|
||||
|
||||
def _transition_to_ssl(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user