diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-08-31 13:43:30 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-31 13:43:30 +0200 |
commit | 7450bef615436d39bcd2a0d2a8892b8f42beea6f (patch) | |
tree | c5588a624892c54c53141c9dd5d991dd379f8b42 /libmproxy | |
parent | 1e9aef5b1e3e1d60a2bb94d47be03b780c10a497 (diff) | |
download | mitmproxy-7450bef615436d39bcd2a0d2a8892b8f42beea6f.tar.gz mitmproxy-7450bef615436d39bcd2a0d2a8892b8f42beea6f.tar.bz2 mitmproxy-7450bef615436d39bcd2a0d2a8892b8f42beea6f.zip |
fix dns_spoofing example, avoid connecting to itself
Diffstat (limited to 'libmproxy')
-rw-r--r-- | libmproxy/models/connections.py | 2 | ||||
-rw-r--r-- | libmproxy/models/flow.py | 2 | ||||
-rw-r--r-- | libmproxy/protocol/base.py | 21 | ||||
-rw-r--r-- | libmproxy/protocol/http_replay.py | 1 | ||||
-rw-r--r-- | libmproxy/proxy/config.py | 2 | ||||
-rw-r--r-- | libmproxy/proxy/server.py | 2 |
6 files changed, 25 insertions, 5 deletions
diff --git a/libmproxy/models/connections.py b/libmproxy/models/connections.py index 98bae3cc..f1e10de9 100644 --- a/libmproxy/models/connections.py +++ b/libmproxy/models/connections.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import (absolute_import, print_function, division) import copy import os diff --git a/libmproxy/models/flow.py b/libmproxy/models/flow.py index 58287e5b..8eff18f4 100644 --- a/libmproxy/models/flow.py +++ b/libmproxy/models/flow.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import (absolute_import, print_function, division) import copy import uuid diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index 3440cb01..d1af547f 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -103,6 +103,7 @@ class ServerConnectionMixin(object): def __init__(self, server_address=None): super(ServerConnectionMixin, self).__init__() self.server_conn = ServerConnection(server_address) + self._check_self_connect() def reconnect(self): address = self.server_conn.address @@ -110,12 +111,30 @@ class ServerConnectionMixin(object): self.server_conn.address = address self.connect() + def _check_self_connect(self): + """ + We try to protect the proxy from _accidentally_ connecting to itself, + e.g. because of a failed transparent lookup or an invalid configuration. + """ + address = self.server_conn.address + if address: + self_connect = ( + address.port == self.config.port and + address.host in ("localhost", "127.0.0.1", "::1") + ) + if self_connect: + raise ProtocolException( + "Invalid server address: {}\r\n" + "The proxy shall not connect to itself.".format(repr(address)) + ) + def set_server(self, address, server_tls=None, sni=None, depth=1): if depth == 1: if self.server_conn: self._disconnect() self.log("Set new server address: " + repr(address), "debug") self.server_conn.address = address + self._check_self_connect() if server_tls: raise ProtocolException( "Cannot upgrade to TLS, no TLS layer on the protocol stack." @@ -141,7 +160,7 @@ class ServerConnectionMixin(object): self.server_conn.connect() except tcp.NetLibError as e: raise ProtocolException( - "Server connection to '%s' failed: %s" % (self.server_conn.address, e), e) + "Server connection to %s failed: %s" % (repr(self.server_conn.address), e), e) class Log(object): diff --git a/libmproxy/protocol/http_replay.py b/libmproxy/protocol/http_replay.py index e0144c93..c37fd131 100644 --- a/libmproxy/protocol/http_replay.py +++ b/libmproxy/protocol/http_replay.py @@ -1,3 +1,4 @@ +from __future__ import (absolute_import, print_function, division) import threading from netlib.http import HttpError diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 65029087..8d2a286d 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import (absolute_import, print_function, division) import collections import os import re diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 2a451ba1..b565ef86 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, print_function +from __future__ import (absolute_import, print_function, division) import traceback import sys |