Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Rationalize pathoc arguments, add -r flag to randomly select a request from the provided specs

Browse Source
This commit is contained in:
Aldo Cortesi 2014-10-25 16:43:01 +13:00
parent 384abbfdd5
commit ac4e9f8cb5
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libpathod/cmdline.py
View File

@ -36,7 +36,14 @@ def go_pathoc():
)
parser.add_argument(
"-n", dest='repeat', default=1, type=int, metavar="N",
help='Repeat requests N times'
help='Repeat N times'
)
parser.add_argument(
"-r", dest="random", action="store_true", default=False,
help="""
Select a random request from those specified. If this is not specified,
requests are all played in sequence.
"""
)
parser.add_argument(
"-t", dest="timeout", type=int, default=None,
@ -48,7 +55,7 @@ def go_pathoc():
help='Host and port to connect to'
)
parser.add_argument(
'request', type=str, nargs="+",
'requests', type=str, nargs="+",
help="""
Request specification, or path to a file containing request
specifcations
@ -110,7 +117,7 @@ def go_pathoc():
help="Print full request"
)
group.add_argument(
"-r", dest="showresp", action="store_true", default=False,
"-p", dest="showresp", action="store_true", default=False,
help="Print full response"
)
group.add_argument(
@ -155,7 +162,7 @@ def go_pathoc():
args.connect_to = None
reqs = []
for r in args.request:
for r in args.requests:
if os.path.exists(r):
data = open(r).read()
r = data
@ -165,7 +172,7 @@ def go_pathoc():
print >> sys.stderr, "Error parsing request spec: %s"%v.msg
print >> sys.stderr, v.marked()
sys.exit(1)
args.request = reqs
args.requests = reqs
pathoc.main(args)

9
libpathod/pathoc.py
View File

@ -1,5 +1,6 @@
import sys
import os
import random
from netlib import tcp, http, certutils
import netlib.utils
@ -189,7 +190,7 @@ class Pathoc(tcp.TCPClient):
if resp:
self._show_summary(fp, *resp)
if self.sslinfo:
if showssl and self.sslinfo:
print >> fp, "Cipher: %s, %s bit, %s"%self.sslinfo.cipher
print >> fp, "SSL certificate chain:\n"
for i in self.sslinfo.certchain:
@ -239,7 +240,11 @@ def main(args):
sys.exit(1)
if args.timeout:
p.settimeout(args.timeout)
for spec in args.request:
if args.random:
playlist = [random.choice(args.requests)]
else:
playlist = args.requests
for spec in playlist:
ret = p.print_request(
spec,
showreq=args.showreq,