diff --git a/core/sslstrip/ClientRequest.py b/core/sslstrip/ClientRequest.py index a132d2b..11db682 100644 --- a/core/sslstrip/ClientRequest.py +++ b/core/sslstrip/ClientRequest.py @@ -189,7 +189,7 @@ class ClientRequest(Request): address = self.dnsCache.getCachedAddress(host) if address != None: - mitmf_logger.debug("[ClientRequest] Host cached: {} {}".format(host, str(address))) + mitmf_logger.debug("[ClientRequest] Host cached: {} {}".format(host, address)) return defer.succeed(address) else: diff --git a/core/sslstrip/DnsCache.py b/core/sslstrip/DnsCache.py index 926835a..355fd12 100644 --- a/core/sslstrip/DnsCache.py +++ b/core/sslstrip/DnsCache.py @@ -51,7 +51,7 @@ class DnsCache: def setCustomRes(self, host, ip_address=None): if ip_address is not None: self.cache[host] = ip_address - mitmf_logger.debug("DNS entry set: %s -> %s" %(host, ip_address)) + mitmf_logger.debug("[DNSCache] DNS entry set: %s -> %s" %(host, ip_address)) else: if self.customAddress is not None: self.cache[host] = self.customAddress diff --git a/core/sslstrip/ServerConnection.py b/core/sslstrip/ServerConnection.py index 2ce07ac..d5acf5f 100644 --- a/core/sslstrip/ServerConnection.py +++ b/core/sslstrip/ServerConnection.py @@ -75,6 +75,7 @@ class ServerConnection(HTTPClient): self.clientInfo = "{} ".format(self.client.getClientIP()) mitmf_logger.info(self.clientInfo + "Sending Request: {}".format(self.headers['host'])) + mitmf_logger.debug("[ServerConnection] Full request: {}{}".format(self.headers['host'], self.uri)) self.plugins.hook() self.sendCommand(self.command, self.uri) @@ -105,7 +106,7 @@ class ServerConnection(HTTPClient): self.sendPostData() def handleStatus(self, version, code, message): - mitmf_logger.debug("[ServerConnection] Got server response: {0} {1} {2}".format(version, code, message)) + mitmf_logger.debug("[ServerConnection] Server response: {0} {1} {2}".format(version, code, message)) self.client.setResponseCode(int(code), message) def handleHeader(self, key, value): @@ -167,8 +168,10 @@ class ServerConnection(HTTPClient): mitmf_logger.debug("[ServerConnection] Decompressing content...") data = gzip.GzipFile('', 'rb', 9, StringIO.StringIO(data)).read() - #mitmf_logger.debug("Read from server:\n" + data) - mitmf_logger.debug("[ServerConnection] Read from server {} bytes of data".format(len(data))) + if len(data) < 1500: + mitmf_logger.debug("[ServerConnection] Read from server {} bytes of data:\n{}".format(len(data), data)) + else: + mitmf_logger.debug("[ServerConnection] Read from server {} bytes of data".format(len(data))) data = self.replaceSecureLinks(data) res = self.plugins.hook() diff --git a/libs/dnschef b/libs/dnschef index 9707672..d24a8c2 160000 --- a/libs/dnschef +++ b/libs/dnschef @@ -1 +1 @@ -Subproject commit 9707672de62bd42f651fabc6f9d368d7a67b4d99 +Subproject commit d24a8c2237eaae372e60a47f175694e8afa07c32