github/Responder
1
0
Fork 0
mirror of https://github.com/lgandx/Responder.git synced 2025-08-19 21:03:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added the ability to provide external IP on WPAD poison via DHCP

Browse source
This commit is contained in:
lgandx 2021-12-09 22:38:44 -03:00
commit ba885b9345
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
poisoners/DHCP.py
View file

@ -79,7 +79,7 @@ config.read(os.path.join(BASEDIR,'Responder.conf'))
RespondTo = [_f for _f in [x.upper().strip() for x in config.get('Responder Core', 'RespondTo').strip().split(',')] if _f] RespondTo = [_f for _f in [x.upper().strip() for x in config.get('Responder Core', 'RespondTo').strip().split(',')] if _f]
DontRespondTo = [_f for _f in [x.upper().strip() for x in config.get('Responder Core', 'DontRespondTo').strip().split(',')] if _f] DontRespondTo = [_f for _f in [x.upper().strip() for x in config.get('Responder Core', 'DontRespondTo').strip().split(',')] if _f]
Interface = settings.Config.Interface Interface = settings.Config.Interface
Responder_IP = FindLocalIP(Interface, None) Responder_IP = RespondWithIP()
ROUTERIP = Responder_IP # Set to Responder_IP in case we fall on a static IP network and we don't get a DHCP Offer. This var will be updated with the real dhcp IP if present. ROUTERIP = Responder_IP # Set to Responder_IP in case we fall on a static IP network and we don't get a DHCP Offer. This var will be updated with the real dhcp IP if present.
NETMASK = "255.255.255.0" NETMASK = "255.255.255.0"
DNSIP = "0.0.0.0" DNSIP = "0.0.0.0"

12
settings.py
View file

@ -23,7 +23,7 @@ import subprocess
from utils import * from utils import *
__version__ = 'Responder 3.0.8.0' __version__ = 'Responder 3.0.9.0'
class Settings: class Settings:
@ -131,10 +131,6 @@ class Settings:
self.Verbose = options.Verbose self.Verbose = options.Verbose
self.ProxyAuth_On_Off = options.ProxyAuth_On_Off self.ProxyAuth_On_Off = options.ProxyAuth_On_Off
self.CommandLine = str(sys.argv) self.CommandLine = str(sys.argv)
if self.ExternalIP:
self.ExternalIPAton = socket.inet_aton(self.ExternalIP)
self.Bind_To = utils.FindLocalIP(self.Interface, self.OURIP) self.Bind_To = utils.FindLocalIP(self.Interface, self.OURIP)
if self.Interface == "ALL": if self.Interface == "ALL":
@ -147,6 +143,12 @@ class Settings:
else: else:
self.IP_aton = socket.inet_aton(self.Bind_To) self.IP_aton = socket.inet_aton(self.Bind_To)
if self.ExternalIP:
self.ExternalIPAton = socket.inet_aton(self.ExternalIP)
self.ExternalResponderIP = utils.RespondWithIP()
else:
self.ExternalResponderIP = self.Bind_To
self.Os_version = sys.platform self.Os_version = sys.platform
self.FTPLog = os.path.join(self.LogDir, 'FTP-Clear-Text-Password-%s.txt') self.FTPLog = os.path.join(self.LogDir, 'FTP-Clear-Text-Password-%s.txt')

12
utils.py
View file

@ -128,6 +128,18 @@ def RespondWithIPAton():
else: else:
return settings.Config.IP_aton.decode('latin-1') return settings.Config.IP_aton.decode('latin-1')
def RespondWithIP():
if settings.Config.PY2OR3 == "PY2":
if settings.Config.ExternalIP:
return settings.Config.ExternalIP
else:
return settings.Config.Bind_To
else:
if settings.Config.ExternalIP:
return settings.Config.ExternalIP
else:
return settings.Config.Bind_To
def OsInterfaceIsSupported(): def OsInterfaceIsSupported():
if settings.Config.Interface != "Not set": if settings.Config.Interface != "Not set":
return not IsOsX() return not IsOsX()