Spoof mode

2 files changed, 10 insertions, 6 deletions

diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py
index 2074d0bf..7305d72a 100644
--- a/libmproxy/proxy/config.py
+++ b/libmproxy/proxy/config.py
@@ -4,7 +4,7 @@ import re
 from OpenSSL import SSL
 from netlib import http_auth, certutils, tcp
 from .. import utils, platform, version
-from .primitives import RegularProxyMode, HTTPTransparentProxyMode, TransparentProxyMode, UpstreamProxyMode, ReverseProxyMode, Socks5ProxyMode
+from .primitives import RegularProxyMode, SpoofMode, TransparentProxyMode, UpstreamProxyMode, ReverseProxyMode, Socks5ProxyMode
 
 TRANSPARENT_SSL_PORTS = [443, 8443]
 CONF_BASENAME = "mitmproxy"
@@ -70,8 +70,8 @@ class ProxyConfig:
             self.mode = ReverseProxyMode(upstream_server)
         elif mode == "upstream":
             self.mode = UpstreamProxyMode(upstream_server)
-        elif mode == "httptransparent":
-            self.mode = HTTPTransparentProxyMode()
+        elif mode == "spoof":
+            self.mode = SpoofMode()
         else:
             self.mode = RegularProxyMode()
 
@@ -146,9 +146,9 @@ def process_proxy_options(parser, options):
         c += 1
         mode = "upstream"
         upstream_server = options.upstream_proxy
-    if options.http_transparent_proxy:
+    if options.spoof_mode:
         c += 1
-        mode = "httptransparent"
+        mode = "spoof"
     if c > 1:
         return parser.error(
             "Transparent, SOCKS5, reverse and upstream proxy mode "
diff --git a/libmproxy/proxy/primitives.py b/libmproxy/proxy/primitives.py
index a9718051..f514d37f 100644
--- a/libmproxy/proxy/primitives.py
+++ b/libmproxy/proxy/primitives.py
@@ -51,13 +51,17 @@ class RegularProxyMode(ProxyMode):
         return None
 
 
-class HTTPTransparentProxyMode(ProxyMode):
+class SpoofMode(ProxyMode):
     http_form_in = "relative"
     http_form_out = "relative"
 
     def get_upstream_server(self, client_conn):
         return None
 
+    @property
+    def name(self):
+        return "spoof"
+
 
 class TransparentProxyMode(ProxyMode):
     http_form_in = "relative"