github/Responder
1
0
Fork 0
mirror of https://github.com/lgandx/Responder.git synced 2025-07-06 04:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare values with == instead of is

Browse source 
`==` should be used when comparing values, `is` should be used to compare identities.
Modern versions of Python throw a SyntaxWarning.
This commit is contained in:
HexPandaa 2021-04-02 17:10:17 +02:00 • committed by GitHub
parent 3d9147f36c
commit 51f176633e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/MultiRelay.py
View file

@ -29,7 +29,7 @@ import time
import random import random
import subprocess import subprocess
from threading import Thread from threading import Thread
if PY2OR3 is "PY3": if PY2OR3 == "PY3":
from socketserver import TCPServer, UDPServer, ThreadingMixIn, BaseRequestHandler from socketserver import TCPServer, UDPServer, ThreadingMixIn, BaseRequestHandler
else: else:
from SocketServer import TCPServer, UDPServer, ThreadingMixIn, BaseRequestHandler from SocketServer import TCPServer, UDPServer, ThreadingMixIn, BaseRequestHandler
@ -159,13 +159,13 @@ Logs = logging
Logs.basicConfig(filemode="w",filename=Logs_Path+'logs/SMBRelay-Session.txt',level=logging.INFO, format='%(asctime)s - %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p') Logs.basicConfig(filemode="w",filename=Logs_Path+'logs/SMBRelay-Session.txt',level=logging.INFO, format='%(asctime)s - %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p')
def NetworkSendBufferPython2or3(data): def NetworkSendBufferPython2or3(data):
if PY2OR3 is "PY2": if PY2OR3 == "PY2":
return str(data) return str(data)
else: else:
return bytes(str(data), 'latin-1') return bytes(str(data), 'latin-1')
def NetworkRecvBufferPython2or3(data): def NetworkRecvBufferPython2or3(data):
if PY2OR3 is "PY2": if PY2OR3 == "PY2":
return str(data) return str(data)
else: else:
return str(data.decode('latin-1')) return str(data.decode('latin-1'))
@ -446,12 +446,12 @@ class SMBRelay(BaseRequestHandler):
data = self.request.recv(4096) data = self.request.recv(4096)
## Make sure it's not a Kerberos auth. ## Make sure it's not a Kerberos auth.
if data.find(b'NTLM') is not -1: if data.find(b'NTLM') != -1:
## Start with nego protocol + session setup negotiate to our target. ## Start with nego protocol + session setup negotiate to our target.
data, smbdata, s, challenge = GrabNegotiateFromTarget(data, s, Pivoting) data, smbdata, s, challenge = GrabNegotiateFromTarget(data, s, Pivoting)
## Make sure it's not a Kerberos auth. ## Make sure it's not a Kerberos auth.
if data.find(b'NTLM') is not -1: if data.find(b'NTLM') != -1:
##Relay all that to our client. ##Relay all that to our client.
if data[8:10] == b'\x73\x00': if data[8:10] == b'\x73\x00':
head = SMBHeader(cmd="\x73",flag1="\x98", flag2="\x43\xc8", errorcode="\x16\x00\x00\xc0", pid=pidcalc(data),mid=midcalc(data)) head = SMBHeader(cmd="\x73",flag1="\x98", flag2="\x43\xc8", errorcode="\x16\x00\x00\xc0", pid=pidcalc(data),mid=midcalc(data))