mirror of
https://github.com/lgandx/Responder.git
synced 2025-07-30 11:38:55 -07:00
various changes.
This commit is contained in:
parent
ec3349cb1e
commit
39f8cbb931
2 changed files with 10 additions and 2 deletions
|
@ -54,6 +54,10 @@ elif options.OURIP == None and IsOsX() == True:
|
||||||
print("\n\033[1m\033[31mOSX detected, -i mandatory option is missing\033[0m\n")
|
print("\n\033[1m\033[31mOSX detected, -i mandatory option is missing\033[0m\n")
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
|
elif options.ProxyAuth_On_Off and options.WPAD_On_Off:
|
||||||
|
print("\n\033[1m\033[31mYou cannot use WPAD server and Proxy_Auth server at the same time, choose one of them.\033[0m\n")
|
||||||
|
exit(-1)
|
||||||
|
|
||||||
settings.init()
|
settings.init()
|
||||||
settings.Config.populate(options)
|
settings.Config.populate(options)
|
||||||
|
@ -312,7 +316,7 @@ def main():
|
||||||
|
|
||||||
if settings.Config.WPAD_On_Off:
|
if settings.Config.WPAD_On_Off:
|
||||||
from servers.HTTP_Proxy import HTTP_Proxy
|
from servers.HTTP_Proxy import HTTP_Proxy
|
||||||
threads.append(Thread(target=serve_thread_tcp, args=(settings.Config.Bind_To, 3141, HTTP_Proxy,)))
|
threads.append(Thread(target=serve_thread_tcp, args=(settings.Config.Bind_To, 3128, HTTP_Proxy,)))
|
||||||
|
|
||||||
if settings.Config.ProxyAuth_On_Off:
|
if settings.Config.ProxyAuth_On_Off:
|
||||||
from servers.Proxy_Auth import Proxy_Auth
|
from servers.Proxy_Auth import Proxy_Auth
|
||||||
|
|
|
@ -239,7 +239,11 @@ class Settings:
|
||||||
self.HtmlToInject = ""# Let users set it up themself in Responder.conf. "<img src='file://///"+self.Bind_To+"/pictures/logo.jpg' alt='Loading' height='1' width='1'>"
|
self.HtmlToInject = ""# Let users set it up themself in Responder.conf. "<img src='file://///"+self.Bind_To+"/pictures/logo.jpg' alt='Loading' height='1' width='1'>"
|
||||||
|
|
||||||
if len(self.WPAD_Script) == 0:
|
if len(self.WPAD_Script) == 0:
|
||||||
self.WPAD_Script = 'function FindProxyForURL(url, host){if ((host == "localhost") || shExpMatch(host, "localhost.*") ||(host == "127.0.0.1") || isPlainHostName(host)) return "DIRECT"; return "PROXY '+self.Bind_To+':3128; PROXY '+self.Bind_To+':3141; DIRECT";}'
|
if self.WPAD_On_Off:
|
||||||
|
self.WPAD_Script = 'function FindProxyForURL(url, host){if ((host == "localhost") || shExpMatch(host, "localhost.*") ||(host == "127.0.0.1") || isPlainHostName(host)) return "DIRECT"; return "PROXY '+self.Bind_To+':3128; DIRECT";}'
|
||||||
|
|
||||||
|
if self.ProxyAuth_On_Off:
|
||||||
|
self.WPAD_Script = 'function FindProxyForURL(url, host){if ((host == "localhost") || shExpMatch(host, "localhost.*") ||(host == "127.0.0.1") || isPlainHostName(host)) return "DIRECT"; return "PROXY '+self.Bind_To+':3128; DIRECT";}'
|
||||||
|
|
||||||
if self.Serve_Exe == True:
|
if self.Serve_Exe == True:
|
||||||
if not os.path.exists(self.Html_Filename):
|
if not os.path.exists(self.Html_Filename):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue