Changeset 80

Timestamp:

06/12/15 17:25:01 (9 years ago)

Author:

tim

Message:

fixed a few problems with non-requests scripts
made HTTPS and port guessing a little smarter based on the Referer header
more comments in output

File:

• trunk/bin/bletchley-http2py (modified) (10 diffs)

trunk/bin/bletchley-http2py

@@ -37 +37 @@
 import sys
 import argparse
+import pprint
+import urllib.parse
 
 bopen = lambda f: open(f, 'rb')
@@ -51 +53 @@
 parser.add_argument(
     '--requests', action='store_true', help='Generate a script that uses the'
-    ' python-requests module rather than httplib/http.client (experimental).')
+    ' python-requests module rather than http.client (this will likely become'
+    ' the default in the future).')
 
 args = parser.parse_args()
@@ -71 +74 @@
 
 host = 'TODO'
-port = 80
-use_ssl = False
-protocol = 'http'
+port = None
+protocol = None
 
 headers = []
@@ -103 +105 @@
             port = int(port, 10)
             if port == 443:
-                use_ssl = True
                 protocol = 'https'
         else:
             host = value
 
-
+    # Attempt to guess the port and protocol from the referer header, since
+    # often it is the same site.  Defer to the host header though, if the
+    # info is there.
+    elif name.lower() == 'referer':
+        rurl = urllib.parse.urlparse(value)
+        if rurl.netloc == host:
+            if rurl.scheme == 'https' and protocol == None:
+                protocol = 'https'
+            if rurl.port != None and port == None:
+                port = rurl.port
+
+if protocol == None:
+    protocol == 'http'        
+if port == None:
+    if protocol == 'https':
+        port = 443
+    else:
+        port = 80
+
+
+# XXX: use pprint
 formatted_body = '\n            '.join([repr(body[i:i+40]) for i in range(0,len(body),40)])
 if formatted_body == '':
@@ -123 +144 @@
 from bletchley.CBC import *
 
-# TODO: ensure the host, port, and SSL settings are correct.
+# TODO: ensure the host, port, and protocol settings are correct.
 host = %s
 port = %s
@@ -169 +190 @@
     body = (%s)
 
-    return session.request(method, url, headers=headers, data=body, allow_redirects=False)
-    ''' % (repr(method), repr(path), repr(headers), formatted_body))
+    # Set verify=True if you want to validate the server cert
+    return session.request(method, url, headers=headers, data=body, allow_redirects=False, verify=False)
+    ''' % (repr(method), repr(path), pprint.pformat(headers, indent=14), formatted_body))
 
     print('''    
@@ -185 +207 @@
     # These are useful for debugging, but once your response processing is working,
     # remove them so it isn't so verbose.
+    print(response.status_code)
     print(response.headers)
     print(repr(response.content))
@@ -192 +215 @@
 
 
-
 else:
     print('''
-import http.client as httpc
+import http.client
 
 def sendRequest(connection, data=None):
@@ -224 +246 @@
 
 def newConnection():
-    if use_ssl:
-        return httpc.HTTPSConnection(host, port)
+    global protocol
+    if protocol == 'https':
+        return http.client.HTTPSConnection(host, port)
     else:
-        return httpc.HTTPConnection(host, port)
+        return http.client.HTTPConnection(host, port)
 
 
@@ -241 +264 @@
     # These are useful for debugging, but once your response processing is working,
     # remove them so it isn't so verbose.
+    print(response.status)
     print(response.getheaders())
     print(repr(response.read()))