From e9bd8a43ef353a03ba9195236a3aa5faf3788faa Mon Sep 17 00:00:00 2001 From: exploide Date: Thu, 14 Dec 2023 18:20:04 +0100 Subject: [PATCH] fixed 'SyntaxWarning: invalid escape sequence' for Python 3.12+ --- packets.py | 2 +- servers/SMB.py | 4 ++-- settings.py | 4 ++-- utils.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 packets.py mode change 100755 => 100644 settings.py mode change 100755 => 100644 utils.py diff --git a/packets.py b/packets.py old mode 100755 new mode 100644 index e8503f5..931548d --- a/packets.py +++ b/packets.py @@ -215,7 +215,7 @@ class DNS_SRV_Ans(Packet): def calculate(self,data): self.fields["Tid"] = data[0:2] DNSName = ''.join(data[12:].split('\x00')[:1]) - SplitFQDN = re.split('\W+', DNSName) # split the ldap.tcp.blah.blah.blah.domain.tld + SplitFQDN = re.split(r'\W+', DNSName) # split the ldap.tcp.blah.blah.blah.domain.tld #What's the question? we need it first to calc all other len. self.fields["QuestionName"] = DNSName diff --git a/servers/SMB.py b/servers/SMB.py index d6920aa..b93ebb7 100644 --- a/servers/SMB.py +++ b/servers/SMB.py @@ -209,7 +209,7 @@ class SMB1(BaseRequestHandler): # SMB1 & SMB2 Server class, NTLMSSP pass ##Negotiate proto answer SMBv2. - if data[8:10] == b"\x72\x00" and re.search(b"SMB 2.\?\?\?", data): + if data[8:10] == b"\x72\x00" and re.search(rb"SMB 2.\?\?\?", data): head = SMB2Header(CreditCharge="\x00\x00",Credits="\x01\x00") t = SMB2NegoAns() t.calculate() @@ -247,7 +247,7 @@ class SMB1(BaseRequestHandler): # SMB1 & SMB2 Server class, NTLMSSP data = self.request.recv(1024) # Negotiate Protocol Response smbv1 - if data[8:10] == b'\x72\x00' and data[4:5] == b'\xff' and re.search(b'SMB 2.\?\?\?', data) == None: + if data[8:10] == b'\x72\x00' and data[4:5] == b'\xff' and re.search(rb'SMB 2.\?\?\?', data) == None: Header = SMBHeader(cmd="\x72",flag1="\x88", flag2="\x01\xc8", pid=pidcalc(NetworkRecvBufferPython2or3(data)),mid=midcalc(NetworkRecvBufferPython2or3(data))) Body = SMBNegoKerbAns(Dialect=Parse_Nego_Dialect(NetworkRecvBufferPython2or3(data))) Body.calculate() diff --git a/settings.py b/settings.py old mode 100755 new mode 100644 index 6d085d6..86302fa --- a/settings.py +++ b/settings.py @@ -243,10 +243,10 @@ class Settings: if self.Serve_Exe == True: if not os.path.exists(self.Html_Filename): - print(utils.color("/!\ Warning: %s: file not found" % self.Html_Filename, 3, 1)) + print(utils.color("/!\\ Warning: %s: file not found" % self.Html_Filename, 3, 1)) if not os.path.exists(self.Exe_Filename): - print(utils.color("/!\ Warning: %s: file not found" % self.Exe_Filename, 3, 1)) + print(utils.color("/!\\ Warning: %s: file not found" % self.Exe_Filename, 3, 1)) # SSL Options self.SSLKey = config.get('HTTPS Server', 'SSLKey') diff --git a/utils.py b/utils.py old mode 100755 new mode 100644 index 34e0c3f..ff7169a --- a/utils.py +++ b/utils.py @@ -180,7 +180,7 @@ def IsOsX(): def IsIPv6IP(IP): if IP == None: return False - regex = "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))" + regex = r"(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))" ret = re.search(regex, IP) if ret: return True