Changeset 39 for trunk

Timestamp:

02/16/13 21:12:12 (11 years ago)

Author:

tmorgan

Message:

misc output improvements, putting more items in organized functions

File:

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

trunk/bin/bletchley-http2py

@@ -15 +15 @@
 
 
-Copyright (C) 2011-2012 Virtual Security Research, LLC
+Copyright (C) 2011-2013 Virtual Security Research, LLC
 Author: Timothy D. Morgan
 
@@ -64 +64 @@
 
 
-print('''#!/usr/bin/env python
-
-import sys
-# function with either Python 2.7 or 3.x
-try:
-    import http.client as httpc
-except:
-    import httplib as httpc
-''')
-
 
 if '\r\n\r\n' in input_req:
@@ -110 +100 @@
                             'accept-encoding','accept-charset',
                             'connection', 'keep-alive', 'host', 
-                            'content-length']:
+                            'content-length', 'proxy-connection']:
         headers.append((name,[value]))
 
@@ -121 +111 @@
             host = value
 
+
+print('''#!/usr/bin/env python
+
+import sys
+# function with either Python 2.7 or 3.x
+try:
+    import http.client as httpc
+except:
+    import httplib as httpc
+''')
+
+
 print('''
 # TODO: ensure the host, port, and SSL settings are correct.
@@ -129 +131 @@
 
 chunked_body = '\n            '.join([repr(body[i:i+40]) for i in range(0,len(body),40)])
+if chunked_body == '':
+    chunked_body = "''"
 
 print('''
-def sendRequest(connection):
+# TODO: use "data" to supply any parameters to be included in the request
+def sendRequest(connection, data=None):
     method = %s
     path = %s
@@ -155 +160 @@
 
 
-connection = None
-if use_ssl:
-    connection = httpc.HTTPSConnection(host, port)
-else:
-    connection = httpc.HTTPConnection(host, port)
+def newConnection():
+    connection = None
+    if use_ssl:
+        return httpc.HTTPSConnection(host, port)
+    else:
+        return httpc.HTTPConnection(host, port)
 
-# TODO: customize code here to retrieve what you need from the response(s)
-# For information on the response object's interface, see:
-#   http://docs.python.org/library/httplib.html#httpresponse-objects
 
-connection.connect()
-response = sendRequest(connection)
-print(response.getheaders())
-print(repr(response.read()))
-connection.close()
+def fetch(data):
+    ret_val = None
+    connection = newConnection()
+
+    # TODO: customize code here to retrieve what you need from the response(s)
+    # For information on the response object's interface, see:
+    #   http://docs.python.org/library/httplib.html#httpresponse-objects
+    response = sendRequest(connection, data)
+    print(response.getheaders())
+    print(repr(response.read()))
+
+    connection.close()
+    return ret_val
+
+data = ''
+fetch(data)
 ''')