From ae1c2be51c1054ed2307ba787a78dd69424d4cbc Mon Sep 17 00:00:00 2001 From: lgandx Date: Sun, 9 May 2021 19:02:42 -0300 Subject: [PATCH] minor fix --- servers/DNS.py | 8 ++++---- servers/LDAP.py | 8 ++++---- servers/RPC.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/servers/DNS.py b/servers/DNS.py index faa7d81..18a3160 100644 --- a/servers/DNS.py +++ b/servers/DNS.py @@ -39,14 +39,14 @@ class DNS(BaseRequestHandler): try: data, soc = self.request - if ParseDNSType(NetworkRecvBufferPython2or3(data)) is "A" and settings.Config.AnalyzeMode == False: + if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "A" and settings.Config.AnalyzeMode == False: 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], ResolveName), 2, 1)) - if ParseDNSType(NetworkRecvBufferPython2or3(data)) is "SRV" and settings.Config.AnalyzeMode == False: + if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "SRV" and settings.Config.AnalyzeMode == False: buff = DNS_SRV_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) soc.sendto(NetworkSendBufferPython2or3(buff), self.client_address) @@ -65,14 +65,14 @@ class DNSTCP(BaseRequestHandler): try: data = self.request.recv(1024) - if ParseDNSType(NetworkRecvBufferPython2or3(data)) is "A" and settings.Config.AnalyzeMode is False: + if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "A" and settings.Config.AnalyzeMode is False: 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], ResolveName), 2, 1)) - if ParseDNSType(NetworkRecvBufferPython2or3(data)) is "SRV" and settings.Config.AnalyzeMode == False: + if ParseDNSType(NetworkRecvBufferPython2or3(data)) == "SRV" and settings.Config.AnalyzeMode == False: buff = DNS_SRV_Ans() buff.calculate(NetworkRecvBufferPython2or3(data)) self.request.send(NetworkSendBufferPython2or3(buff)) diff --git a/servers/LDAP.py b/servers/LDAP.py index 8bbd976..d6bea7a 100644 --- a/servers/LDAP.py +++ b/servers/LDAP.py @@ -40,11 +40,11 @@ def CalculateDNSName(name): def ParseCLDAPNetlogon(data): try: Dns = data.find(b'DnsDomain') - if Dns is -1: + if Dns == -1: return False DnsName = data[Dns+9:] DnsGuidOff = data.find(b'DomainGuid') - if DnsGuidOff is -1: + if DnsGuidOff == -1: return False Guid = data[DnsGuidOff+10:] if Dns: @@ -72,13 +72,13 @@ def ParseSearch(data): t.calculate() return str(t) - elif re.search(b'(?i)(objectClass0*.*supportedSASLMechanisms)', data): + if re.search(b'(?i)(objectClass0*.*supportedSASLMechanisms)', data): return str(LDAPSearchSupportedMechanismsPacket(MessageIDASNStr=TID,MessageIDASN2Str=TID)) elif re.search(b'(?i)(objectClass0*.*supportedCapabilities)', data): return str(LDAPSearchSupportedCapabilitiesPacket(MessageIDASNStr=TID,MessageIDASN2Str=TID)) - if re.search(b'(objectClass)', data): + elif re.search(b'(objectClass)', data): return str(LDAPSearchDefaultPacket(MessageIDASNStr=TID)) def ParseLDAPHash(data,client, Challenge): #Parse LDAP NTLMSSP v1/v2 diff --git a/servers/RPC.py b/servers/RPC.py index 5df08fb..5c60c5d 100644 --- a/servers/RPC.py +++ b/servers/RPC.py @@ -47,7 +47,7 @@ def Chose3264x(packet): def FindNTLMOpcode(data): SSPIStart = data.find(b'NTLMSSP') - if SSPIStart is -1: + if SSPIStart == -1: return False SSPIString = data[SSPIStart:] return SSPIString[8:12]