From 3dd04d464e71f2af3a288e269397ceb48480ccf4 Mon Sep 17 00:00:00 2001 From: PatchRequest Date: Mon, 1 Aug 2022 21:35:17 +0200 Subject: [PATCH] Console Output with Timestamp Added a timestamp to console output and cleaner code for output --- poisoners/LLMNR.py | 10 ++++++---- poisoners/MDNS.py | 9 ++++++--- poisoners/NBTNS.py | 3 ++- servers/DNS.py | 33 +++++++++++++++++++++++---------- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/poisoners/LLMNR.py b/poisoners/LLMNR.py index 0952325..5c3fb8f 100755 --- a/poisoners/LLMNR.py +++ b/poisoners/LLMNR.py @@ -16,6 +16,7 @@ # along with this program. If not, see . from packets import LLMNR_Ans, LLMNR6_Ans from utils import * +from datetime import datetime if (sys.version_info > (3, 0)): from socketserver import BaseRequestHandler @@ -62,6 +63,7 @@ class LLMNR(BaseRequestHandler): # LLMNR Server class return None #IPv4 if data[2:4] == b'\x00\x00' and LLMNRType: + LineHeader = "[*] [LLMNR]" if settings.Config.AnalyzeMode: LineHeader = "[Analyze mode: LLMNR]" print(color("%s Request by %s for %s, ignoring" % (LineHeader, self.client_address[0].replace("::ffff:",""), Name), 2, 1)) @@ -76,8 +78,8 @@ class LLMNR(BaseRequestHandler): # LLMNR Server class Buffer1 = LLMNR_Ans(Tid=NetworkRecvBufferPython2or3(data[0:2]), QuestionName=Name, AnswerName=Name) Buffer1.calculate() soc.sendto(NetworkSendBufferPython2or3(Buffer1), self.client_address) - LineHeader = "[*] [LLMNR]" - print(color("%s Poisoned answer sent to %s for name %s" % (LineHeader, self.client_address[0].replace("::ffff:",""), Name), 2, 1)) + + print(color("%s %s Poisoned answer sent to %s for name %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S.%f)"), self.client_address[0].replace("::ffff:",""), Name), 2, 1)) SavePoisonersToDb({ 'Poisoner': 'LLMNR', 'SentToIp': self.client_address[0], @@ -89,8 +91,8 @@ class LLMNR(BaseRequestHandler): # LLMNR Server class Buffer1 = LLMNR6_Ans(Tid=NetworkRecvBufferPython2or3(data[0:2]), QuestionName=Name, AnswerName=Name) Buffer1.calculate() soc.sendto(NetworkSendBufferPython2or3(Buffer1), self.client_address) - LineHeader = "[*] [LLMNR]" - print(color("%s Poisoned answer sent to %s for name %s" % (LineHeader, self.client_address[0].replace("::ffff:",""), Name), 2, 1)) + + print(color("%s %s Poisoned answer sent to %s for name %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S.%f)"), self.client_address[0].replace("::ffff:",""), Name), 2, 1)) SavePoisonersToDb({ 'Poisoner': 'LLMNR6', 'SentToIp': self.client_address[0], diff --git a/poisoners/MDNS.py b/poisoners/MDNS.py index a2bf073..69c132a 100755 --- a/poisoners/MDNS.py +++ b/poisoners/MDNS.py @@ -16,6 +16,7 @@ # along with this program. If not, see . import struct import sys +from datetime import datetime if (sys.version_info > (3, 0)): from socketserver import BaseRequestHandler else: @@ -59,7 +60,7 @@ class MDNS(BaseRequestHandler): if (not Request_Name) or (RespondToThisHost(self.client_address[0], Request_Name) is not True): return None - + LineHeader = "[*] [MDNS]" if settings.Config.AnalyzeMode: # Analyze Mode print(text('[Analyze mode: MDNS] Request by %-15s for %s, ignoring' % (color(self.client_address[0].replace("::ffff:",""), 3), color(Request_Name, 3)))) SavePoisonersToDb({ @@ -73,7 +74,8 @@ class MDNS(BaseRequestHandler): Buffer = MDNS_Ans(AnswerName = Poisoned_Name) Buffer.calculate() soc.sendto(NetworkSendBufferPython2or3(Buffer), self.client_address) - print(color('[*] [MDNS] Poisoned answer sent to %-15s for name %s' % (self.client_address[0].replace("::ffff:",""), Request_Name), 2, 1)) + + print(color('%s %s Poisoned answer sent to %-15s for name %s' % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), Request_Name), 2, 1)) SavePoisonersToDb({ 'Poisoner': 'MDNS', 'SentToIp': self.client_address[0], @@ -86,7 +88,8 @@ class MDNS(BaseRequestHandler): Buffer = MDNS6_Ans(AnswerName = Poisoned_Name) Buffer.calculate() soc.sendto(NetworkSendBufferPython2or3(Buffer), self.client_address) - print(color('[*] [MDNS] Poisoned answer sent to %-15s for name %s' % (self.client_address[0].replace("::ffff:",""), Request_Name), 2, 1)) + + print(color('%s %s Poisoned answer sent to %-15s for name %s' % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), Request_Name), 2, 1)) SavePoisonersToDb({ 'Poisoner': 'MDNS6', 'SentToIp': self.client_address[0], diff --git a/poisoners/NBTNS.py b/poisoners/NBTNS.py index 0d94126..05a962a 100755 --- a/poisoners/NBTNS.py +++ b/poisoners/NBTNS.py @@ -17,6 +17,7 @@ import sys from packets import NBT_Ans from utils import * +from datetime import datetime if (sys.version_info > (3, 0)): from socketserver import BaseRequestHandler @@ -48,7 +49,7 @@ class NBTNS(BaseRequestHandler): Buffer1.calculate(data) socket.sendto(NetworkSendBufferPython2or3(Buffer1), self.client_address) LineHeader = "[*] [NBT-NS]" - print(color("%s Poisoned answer sent to %s for name %s (service: %s)" % (LineHeader, self.client_address[0].replace("::ffff:",""), Name, NBT_NS_Role(NetworkRecvBufferPython2or3(data[43:46]))), 2, 1)) + print(color("%s %s Poisoned answer sent to %s for name %s (service: %s)" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"), self.client_address[0].replace("::ffff:",""), Name, NBT_NS_Role(NetworkRecvBufferPython2or3(data[43:46]))), 2, 1)) SavePoisonersToDb({ 'Poisoner': 'NBT-NS', 'SentToIp': self.client_address[0], diff --git a/servers/DNS.py b/servers/DNS.py index 9bbabbe..74df461 100755 --- a/servers/DNS.py +++ b/servers/DNS.py @@ -16,6 +16,7 @@ # along with this program. If not, see . from utils import * from packets import DNS_Ans, DNS_SRV_Ans, DNS6_Ans, DNS_AnsOPT +from datetime import datetime if settings.Config.PY2OR3 == "PY3": from socketserver import BaseRequestHandler else: @@ -44,40 +45,46 @@ class DNS(BaseRequestHandler): try: data, soc = self.request + LineHeader = "[*] [DNS]" if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "A": buff = DNS_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] A Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s A Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "OPTIPv4": buff = DNS_AnsOPT() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] A OPT Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s A OPT Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "SRV": buff = DNS_SRV_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] SRV Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s SRV Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "IPv6": buff = DNS6_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] AAAA Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s AAAA Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "OPTIPv6": buff = DNS6_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] AAAA OPT Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s AAAA OPT Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) except Exception: @@ -92,40 +99,46 @@ class DNSTCP(BaseRequestHandler): try: data = self.request.recv(1024) + LineHeader = "[*] [DNS]" if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "A": buff = DNS_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] A Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s A Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "OPTIPv4": buff = DNS_AnsOPT() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] A OPT Record poisoned answer sent to: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s A OPT Record poisoned answer sent to: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "SRV": buff = DNS_SRV_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] SRV Record poisoned answer sent: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s SRV Record poisoned answer sent: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "IPv6": buff = DNS6_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] AAAA Record poisoned answer sent: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s AAAA Record poisoned answer sent: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "OPTIPv6": buff = DNS6_AnsOPT() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) ResolveName = re.sub('[^0-9a-zA-Z]+', '.', buff.fields["QuestionName"]) - print(color("[*] [DNS] AAAA OPT Record poisoned answer sent: %-15s Requested name: %s" % (self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) + + print(color("%s %s AAAA OPT Record poisoned answer sent: %-15s Requested name: %s" % (LineHeader,datetime.now().strftime("%d-%b-%Y (%H:%M:%S)"),self.client_address[0].replace("::ffff:",""), ResolveName), 2, 1)) except Exception: pass