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

1 files changed, 7 insertions, 2 deletions

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,