diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-12-08 01:14:12 -0800 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-12-08 01:14:12 -0800 |
| commit | 3a1d85ab18dbff82505feac3619af733a0a2b4f7 (patch) | |
| tree | b61bb99ae8e34f73583263619730fbbe5d526161 /libmproxy/cmdline.py | |
| parent | 73791f986a4b4dabd984b7fa7891801d71ab52dc (diff) | |
| parent | b4f6f09c83faf54c4c1493e18ba11d0257ca841b (diff) | |
| download | mitmproxy-3a1d85ab18dbff82505feac3619af733a0a2b4f7.tar.gz mitmproxy-3a1d85ab18dbff82505feac3619af733a0a2b4f7.tar.bz2 mitmproxy-3a1d85ab18dbff82505feac3619af733a0a2b4f7.zip | |
Merge pull request #134 from mhils/scripts_improvements
Support multiple scripts and script arguments. refs #76
Diffstat (limited to 'libmproxy/cmdline.py')
| -rw-r--r-- | libmproxy/cmdline.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 5e120ce1..fc054b5e 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -1,6 +1,8 @@ import proxy import re, filt import argparse +import shlex +import os APP_DOMAIN = "mitm" APP_IP = "1.1.1.1" @@ -143,7 +145,7 @@ def get_common_options(options): replacements = reps, setheaders = setheaders, server_replay = options.server_replay, - script = options.script, + scripts = options.scripts, stickycookie = stickycookie, stickyauth = stickyauth, showhost = options.showhost, @@ -206,8 +208,9 @@ def common_options(parser): ) parser.add_argument( "-s", - action="store", dest="script", default=None, - help="Run a script." + action="append", type=lambda x: shlex.split(x,posix=(os.name != "nt")), dest="scripts", default=[], + metavar='"script.py --bar"', + help="Run a script. Surround with quotes to pass script arguments. Can be passed multiple times." ) parser.add_argument( "-t", |