From ac4e9f8cb5a9541dcff0a86efdb04357b9bc027f Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 25 Oct 2014 16:43:01 +1300 Subject: Rationalize pathoc arguments, add -r flag to randomly select a request from the provided specs --- libpathod/pathoc.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libpathod/pathoc.py') diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index b9b202eb..c85c207a 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -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, -- cgit v1.2.3