diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/cmdline.py | 27 | ||||
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/dump.py | 5 | ||||
| -rw-r--r-- | libmproxy/flow.py | 26 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 5 | ||||
| -rw-r--r-- | libmproxy/script.py | 6 |
6 files changed, 41 insertions, 30 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index fc054b5e..4b5b0f5f 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -4,8 +4,8 @@ import argparse import shlex import os -APP_DOMAIN = "mitm" -APP_IP = "1.1.1.1" +APP_HOST = "mitm" +APP_PORT = 80 class ParseException(Exception): pass class OptionException(Exception): pass @@ -130,8 +130,9 @@ def get_common_options(options): return dict( app = options.app, - app_ip = options.app_ip, - app_domain = options.app_domain, + app_host = options.app_host, + app_port = options.app_port, + app_external = options.app_external, anticache = options.anticache, anticomp = options.anticomp, @@ -268,15 +269,19 @@ def common_options(parser): help="Enable the mitmproxy web app." ) group.add_argument( - "--appdomain", - action="store", dest="app_domain", default=APP_DOMAIN, metavar="domain", - help="Domain to serve the app from." + "--app-host", + action="store", dest="app_host", default=APP_HOST, metavar="host", + help="Domain to serve the app from. For transparent mode, use an IP when a DNS entry for the app domain is not present." ) group.add_argument( - "--appip", - action="store", dest="app_ip", default=APP_IP, metavar="ip", - help="""IP to serve the app from. Useful for transparent mode, when a DNS - entry for the app domain is not present.""" + "--app-port", + action="store", dest="app_port", default=APP_PORT, type=int, metavar="80", + help="Port to serve the app from." + ) + group.add_argument( + "--app-external", + action="store_true", dest="app_external", + help="Serve the app outside of the proxy." ) group = parser.add_argument_group("Client Replay") diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 04e240d3..b2c1deef 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -423,7 +423,7 @@ class ConsoleMaster(flow.FlowMaster): sys.exit(1) if options.app: - self.start_app(options.app_domain, options.app_ip) + self.start_app(self.o.app_host, self.o.app_port, self.o.app_external) def start_stream(self, path): path = os.path.expanduser(path) diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 12488937..55fd94b3 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -109,7 +109,8 @@ class DumpMaster(flow.FlowMaster): not options.keepserving ) - for script_argv in options.scripts: + scripts = options.scripts or [] + for script_argv in scripts: err = self.load_script(script_argv) if err: raise DumpError(err) @@ -127,7 +128,7 @@ class DumpMaster(flow.FlowMaster): self.add_event("Flow file corrupted. Stopped loading.") if self.o.app: - self.start_app(self.o.app_domain, self.o.app_ip) + self.start_app(self.o.app_host, self.o.app_port, self.o.app_external) def _readflow(self, path): path = os.path.expanduser(path) diff --git a/libmproxy/flow.py b/libmproxy/flow.py index d79f2862..96103ddb 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -2,7 +2,7 @@ This module provides more sophisticated flow tracking. These match requests with their responses, and provide filtering and interception facilities. """ -import hashlib, Cookie, cookielib, copy, re, urlparse, os +import hashlib, Cookie, cookielib, copy, re, urlparse, os, threading import time, urllib import tnetstring, filt, script, utils, encoding, proxy from email.utils import parsedate_tz, formatdate, mktime_tz @@ -1367,17 +1367,19 @@ class FlowMaster(controller.Master): self.stream = None app.mapp.config["PMASTER"] = self - def start_app(self, domain, ip): - self.server.apps.add( - app.mapp, - domain, - 80 - ) - self.server.apps.add( - app.mapp, - ip, - 80 - ) + def start_app(self, host, port, external): + if not external: + self.server.apps.add( + app.mapp, + host, + port + ) + else: + print host + threading.Thread(target=app.mapp.run,kwargs={ + "use_reloader": False, + "host": host, + "port": port}).start() def add_event(self, e, level="info"): """ diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 1fc289ed..ab2cdb7c 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -474,8 +474,9 @@ class ProxyHandler(tcp.BaseHandler): self.wfile.write("Server: %s\r\n"%self.server_version) self.wfile.write("Content-type: text/html\r\n") self.wfile.write("Content-Length: %d\r\n"%len(html_content)) - for key, value in headers.items(): - self.wfile.write("%s: %s\r\n"%(key, value)) + if headers: + for key, value in headers.items(): + self.wfile.write("%s: %s\r\n"%(key, value)) self.wfile.write("Connection: close\r\n") self.wfile.write("\r\n") self.wfile.write(html_content) diff --git a/libmproxy/script.py b/libmproxy/script.py index c32628b0..623f2b92 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -31,10 +31,12 @@ class Script: ns = {} try: execfile(path, ns, ns) - self.ns = ns - self.run("start", self.argv) except Exception, v: raise ScriptError(traceback.format_exc(v)) + self.ns = ns + r = self.run("start", self.argv) + if not r[0] and r[1]: + raise ScriptError(r[1][1]) def unload(self): return self.run("done") |