Permalink
Browse files

use argparse instead of optparse

  • Loading branch information...
1 parent bbaa8bd commit ed389d8f05e81c99575ca1779bf427283b4e57a3 @mhils committed Aug 17, 2012
Showing with 64 additions and 78 deletions.
  1. +38 −42 libmproxy/cmdline.py
  2. +6 −7 libmproxy/proxy.py
  3. +9 −12 mitmdump
  4. +11 −17 mitmproxy
View
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import proxy
-import optparse, re, filt
+import re, filt
class ParseReplaceException(Exception): pass
@@ -119,165 +119,161 @@ def get_common_options(options):
def common_options(parser):
- parser.add_option(
+ parser.add_argument(
"-a",
- action="store", type = "str", dest="addr", default='',
+ action="store", type = str, dest="addr", default='',
help = "Address to bind proxy to (defaults to all interfaces)"
)
- parser.add_option(
+ parser.add_argument(
"--anticache",
action="store_true", dest="anticache", default=False,
help="Strip out request headers that might cause the server to return 304-not-modified."
)
- parser.add_option(
+ parser.add_argument(
"--confdir",
- action="store", type = "str", dest="confdir", default='~/.mitmproxy',
+ action="store", type = str, dest="confdir", default='~/.mitmproxy',
help = "Configuration directory. (~/.mitmproxy)"
)
- parser.add_option(
+ parser.add_argument(
"-e",
action="store_true", dest="eventlog",
help="Show event log."
)
- parser.add_option(
+ parser.add_argument(
"-n",
action="store_true", dest="no_server",
help="Don't start a proxy server."
)
- parser.add_option(
+ parser.add_argument(
"-p",
- action="store", type = "int", dest="port", default=8080,
+ action="store", type = int, dest="port", default=8080,
help = "Proxy service port."
)
- parser.add_option(
+ parser.add_argument(
"-P",
action="store", dest="reverse_proxy", default=None,
help="Reverse proxy to upstream server: http[s]://host[:port]"
)
- parser.add_option(
+ parser.add_argument(
"-q",
action="store_true", dest="quiet",
help="Quiet."
)
- parser.add_option(
+ parser.add_argument(
"-r",
action="store", dest="rfile", default=None,
help="Read flows from file."
)
- parser.add_option(
+ parser.add_argument(
"-s",
action="store", dest="script", default=None,
help="Run a script."
)
- parser.add_option(
+ parser.add_argument(
"-t",
action="store", dest="stickycookie_filt", default=None, metavar="FILTER",
help="Set sticky cookie filter. Matched against requests."
)
- parser.add_option(
+ parser.add_argument(
"-T",
action="store_true", dest="transparent_proxy", default=False,
help="Set transparent proxy mode."
)
- parser.add_option(
+ parser.add_argument(
"-u",
action="store", dest="stickyauth_filt", default=None, metavar="FILTER",
help="Set sticky auth filter. Matched against requests."
)
- parser.add_option(
+ parser.add_argument(
"-v",
action="count", dest="verbose", default=1,
help="Increase verbosity. Can be passed multiple times."
)
- parser.add_option(
+ parser.add_argument(
"-w",
action="store", dest="wfile", default=None,
help="Write flows to file."
)
- parser.add_option(
+ parser.add_argument(
"-z",
action="store_true", dest="anticomp", default=False,
help="Try to convince servers to send us un-compressed data."
)
- parser.add_option(
+ parser.add_argument(
"-Z",
action="store", dest="body_size_limit", default=None,
metavar="SIZE",
help="Byte size limit of HTTP request and response bodies."\
" Understands k/m/g suffixes, i.e. 3m for 3 megabytes."
)
- parser.add_option(
- "--cert-wait-time", type="float",
+ parser.add_argument(
+ "--cert-wait-time", type=float,
action="store", dest="cert_wait_time", default=0,
help="Wait for specified number of seconds after a new cert is generated. This can smooth over small discrepancies between the client and server times."
)
- parser.add_option(
+ parser.add_argument(
"--no-upstream-cert", default=False,
action="store_true", dest="no_upstream_cert",
help="Don't connect to upstream server to look up certificate details."
)
- group = optparse.OptionGroup(parser, "Client Replay")
- group.add_option(
+ group = parser.add_argument_group("Client Replay")
+ group.add_argument(
"-c",
action="store", dest="client_replay", default=None, metavar="PATH",
help="Replay client requests from a saved file."
)
- parser.add_option_group(group)
- group = optparse.OptionGroup(parser, "Server Replay")
- group.add_option(
+ group = parser.add_argument_group("Server Replay")
+ group.add_argument(
"-S",
action="store", dest="server_replay", default=None, metavar="PATH",
help="Replay server responses from a saved file."
)
- group.add_option(
+ group.add_argument(
"-k",
action="store_true", dest="kill", default=False,
help="Kill extra requests during replay."
)
- group.add_option(
+ group.add_argument(
"--rheader",
- action="append", dest="rheaders", type="str",
+ action="append", dest="rheaders", type=str,
help="Request headers to be considered during replay. "
"Can be passed multiple times."
)
- group.add_option(
+ group.add_argument(
"--norefresh",
action="store_true", dest="norefresh", default=False,
help= "Disable response refresh, "
"which updates times in cookies and headers for replayed responses."
)
- group.add_option(
+ group.add_argument(
"--no-pop",
action="store_true", dest="nopop", default=False,
help="Disable response pop from response flow. "
"This makes it possible to replay same response multiple times."
)
- parser.add_option_group(group)
- group = optparse.OptionGroup(
- parser,
+ group = parser.add_argument_group(
"Replacements",
"""
Replacements are of the form "/pattern/regex/replacement", where
the separator can be any character. Please see the documentation
for more information.
""".strip()
)
- group.add_option(
+ group.add_argument(
"--replace",
- action="append", type="str", dest="replace", default=[],
+ action="append", type=str, dest="replace", default=[],
metavar="PATTERN",
help="Replacement pattern."
)
- group.add_option(
+ group.add_argument(
"--replace-from-file",
- action="append", type="str", dest="replace_file", default=[],
+ action="append", type=str, dest="replace_file", default=[],
metavar="PATTERN",
help="Replacement pattern, where the replacement clause is a path to a file."
)
- parser.add_option_group(group)
group.add_option(
"--dummy-certs", action="store",
View
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import sys, os, string, socket, time
import shutil, tempfile, threading
-import optparse, SocketServer
+import SocketServer
from OpenSSL import SSL
from netlib import odict, tcp, http, wsgi, certutils, http_status
import utils, flow, version, platform, controller
@@ -464,18 +464,17 @@ def shutdown(self):
# Command-line utils
def certificate_option_group(parser):
- group = optparse.OptionGroup(parser, "SSL")
- group.add_option(
+ group = parser.add_argument_group("SSL")
+ group.add_argument(
"--cert", action="store",
- type = "str", dest="cert", default=None,
+ type = str, dest="cert", default=None,
help = "User-created SSL certificate file."
)
- group.add_option(
+ group.add_argument(
"--client-certs", action="store",
- type = "str", dest = "clientcerts", default=None,
+ type = str, dest = "clientcerts", default=None,
help = "Client certificate directory."
)
- parser.add_option_group(group)
TRANSPARENT_SSL_PORTS = [443, 8443]
View
@@ -16,24 +16,21 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import sys, signal
-from libmproxy import proxy, dump, cmdline
-from libmproxy.version import VERSION
-from optparse import OptionParser
-
+from libmproxy import proxy, dump, cmdline, version
+import argparse
if __name__ == '__main__':
- parser = OptionParser(
- usage = "%prog [options] [filter]",
- version="%%prog %s"%VERSION,
- )
+ parser = argparse.ArgumentParser(usage = "%(prog)s [options] [filter]")
+ parser.add_argument('--version', action='version', version=version.NAMEVERSION)
cmdline.common_options(parser)
- parser.add_option(
+ parser.add_argument(
"--keepserving",
action="store_true", dest="keepserving", default=False,
help="Continue serving after client playback or file read. We exit by default."
)
+ parser.add_argument('args', nargs=argparse.REMAINDER)
- options, args = parser.parse_args()
+ options = parser.parse_args()
if options.quiet:
options.verbose = 0
@@ -55,8 +52,8 @@ if __name__ == '__main__':
parser.error(v.message)
dumpopts.keepserving = options.keepserving
- if args:
- filt = " ".join(args)
+ if options.args:
+ filt = " ".join(options.args)
else:
filt = None
View
@@ -15,39 +15,33 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import sys
-from libmproxy import proxy, console, cmdline
+import sys, argparse
+from libmproxy import proxy, console, cmdline, version
from libmproxy.console import palettes
-from libmproxy.version import VERSION
-from optparse import OptionParser, OptionGroup
if __name__ == '__main__':
- parser = OptionParser(
- usage = "%prog [options]",
- version="%%prog %s"%VERSION,
- )
+ parser = argparse.ArgumentParser(usage = "%(prog)s [options]")
+ parser.add_argument('--version', action='version', version=version.NAMEVERSION)
cmdline.common_options(parser)
- parser.add_option("--debug", dest="debug", default=False, action="store_true")
- parser.add_option(
- "--palette", type="str", default="dark",
+ parser.add_argument("--debug", dest="debug", default=False, action="store_true")
+ parser.add_argument(
+ "--palette", type=str, default="dark",
action="store", dest="palette",
help="Select color palette: " + ", ".join(palettes.palettes.keys())
)
- group = OptionGroup(
- parser,
+ group = parser.add_argument_group(
"Filters",
"See help in mitmproxy for filter expression syntax."
)
- group.add_option(
+ group.add_argument(
"-i", "--intercept", action="store",
- type = "str", dest="intercept", default=None,
+ type = str, dest="intercept", default=None,
help = "Intercept filter expression."
)
- parser.add_option_group(group)
- options, args = parser.parse_args()
+ options = parser.parse_args()
config = proxy.process_proxy_options(parser, options)

0 comments on commit ed389d8

Please sign in to comment.