From e9bff5ac565f4d8e9e9db224ee5f95684dd4c049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E4=BA=91?= Date: Thu, 10 Mar 2016 15:08:34 +0800 Subject: add resolved IP address in "Details" tab --- mitmproxy/console/flowdetailview.py | 1 + mitmproxy/flow_format_compat.py | 1 + mitmproxy/models/connections.py | 1 + netlib/tcp.py | 3 +++ 4 files changed, 6 insertions(+) diff --git a/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py index 757c76fd..add2ebd0 100644 --- a/mitmproxy/console/flowdetailview.py +++ b/mitmproxy/console/flowdetailview.py @@ -23,6 +23,7 @@ def flowdetails(state, flow): text.append(urwid.Text([("head", "Server Connection:")])) parts = [ ["Address", repr(sc.address)], + ["Resolved", repr(sc.sock_address)], ] text.extend( diff --git a/mitmproxy/flow_format_compat.py b/mitmproxy/flow_format_compat.py index a7a95af3..b96c6bcb 100644 --- a/mitmproxy/flow_format_compat.py +++ b/mitmproxy/flow_format_compat.py @@ -35,6 +35,7 @@ def convert_015_016(data): def convert_016_017(data): + data["server_conn"]["sock_address"] = None data["version"] = (0, 17) return data diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py index 857580b8..6df67150 100644 --- a/mitmproxy/models/connections.py +++ b/mitmproxy/models/connections.py @@ -120,6 +120,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): timestamp_tcp_setup=float, timestamp_ssl_setup=float, address=tcp.Address, + sock_address=tcp.Address, source_address=tcp.Address, cert=certutils.SSLCert, ssl_established=bool, diff --git a/netlib/tcp.py b/netlib/tcp.py index 6423888a..4d01a03b 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -458,9 +458,11 @@ class _Connection(object): def __init__(self, connection): if connection: self.connection = connection + self.sock_address = Address(connection.getpeername()) self._makefile() else: self.connection = None + self.sock_address = None self.rfile = None self.wfile = None @@ -701,6 +703,7 @@ class TCPClient(_Connection): 'Error connecting to "%s": %s' % (self.address.host, err)) self.connection = connection + self.sock_address = Address(connection.getpeername()) self._makefile() def settimeout(self, n): -- cgit v1.2.3 From 20ec502032cc360132ee2e3de72c66f75de33ad8 Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Mon, 14 Mar 2016 22:17:12 +0800 Subject: fix tests for "sock_address" --- test/mitmproxy/tutils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py index edcdf3e2..99e83247 100644 --- a/test/mitmproxy/tutils.py +++ b/test/mitmproxy/tutils.py @@ -93,6 +93,7 @@ def tserver_conn(): c = ServerConnection.from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=dict(address=("address", 22), use_ipv6=True), + sock_address=None, cert=None, timestamp_start=1, timestamp_tcp_setup=2, -- cgit v1.2.3 From eecadadce3defaeab955310ad77c874ec9aead5e Mon Sep 17 00:00:00 2001 From: lilydjwg Date: Tue, 15 Mar 2016 21:27:25 +0800 Subject: use "peer_address" instead of "sock_address" --- mitmproxy/console/flowdetailview.py | 2 +- mitmproxy/flow_format_compat.py | 2 +- mitmproxy/models/connections.py | 2 +- netlib/tcp.py | 6 +++--- test/mitmproxy/tutils.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py index add2ebd0..8e3a47ae 100644 --- a/mitmproxy/console/flowdetailview.py +++ b/mitmproxy/console/flowdetailview.py @@ -23,7 +23,7 @@ def flowdetails(state, flow): text.append(urwid.Text([("head", "Server Connection:")])) parts = [ ["Address", repr(sc.address)], - ["Resolved", repr(sc.sock_address)], + ["Peer Address", repr(sc.peer_address)], ] text.extend( diff --git a/mitmproxy/flow_format_compat.py b/mitmproxy/flow_format_compat.py index b96c6bcb..4c3aa727 100644 --- a/mitmproxy/flow_format_compat.py +++ b/mitmproxy/flow_format_compat.py @@ -35,7 +35,7 @@ def convert_015_016(data): def convert_016_017(data): - data["server_conn"]["sock_address"] = None + data["server_conn"]["peer_address"] = None data["version"] = (0, 17) return data diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py index 6df67150..2ffc667d 100644 --- a/mitmproxy/models/connections.py +++ b/mitmproxy/models/connections.py @@ -120,7 +120,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): timestamp_tcp_setup=float, timestamp_ssl_setup=float, address=tcp.Address, - sock_address=tcp.Address, + peer_address=tcp.Address, source_address=tcp.Address, cert=certutils.SSLCert, ssl_established=bool, diff --git a/netlib/tcp.py b/netlib/tcp.py index 4d01a03b..574f3845 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -458,11 +458,11 @@ class _Connection(object): def __init__(self, connection): if connection: self.connection = connection - self.sock_address = Address(connection.getpeername()) + self.peer_address = Address(connection.getpeername()) self._makefile() else: self.connection = None - self.sock_address = None + self.peer_address = None self.rfile = None self.wfile = None @@ -703,7 +703,7 @@ class TCPClient(_Connection): 'Error connecting to "%s": %s' % (self.address.host, err)) self.connection = connection - self.sock_address = Address(connection.getpeername()) + self.peer_address = Address(connection.getpeername()) self._makefile() def settimeout(self, n): diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py index 99e83247..0d65df71 100644 --- a/test/mitmproxy/tutils.py +++ b/test/mitmproxy/tutils.py @@ -93,7 +93,7 @@ def tserver_conn(): c = ServerConnection.from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=dict(address=("address", 22), use_ipv6=True), - sock_address=None, + peer_address=None, cert=None, timestamp_start=1, timestamp_tcp_setup=2, -- cgit v1.2.3