From f2f192f9406abd4ab7933ad4b5bac3b92ca9f843 Mon Sep 17 00:00:00 2001 From: taegeHis Date: Wed, 22 Jan 2020 10:28:50 +0100 Subject: [PATCH] enabled wildcard for multirelay --- tools/MultiRelay/RelayMultiCore.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/MultiRelay/RelayMultiCore.py b/tools/MultiRelay/RelayMultiCore.py index ee2fa86..7124b95 100644 --- a/tools/MultiRelay/RelayMultiCore.py +++ b/tools/MultiRelay/RelayMultiCore.py @@ -133,7 +133,7 @@ def ParseHTTPHash(data, key, client, UserToRelay, Host, Pivoting): if ('!' + User) in UserToRelay: print "[+] Username: %s is blacklisted, dropping connection." % User return None, None - elif User in UserToRelay or "ALL" in UserToRelay: + elif User in UserToRelay or "ALL" in UserToRelay or [x for x in UserToRelay if re.match(x+"$",User)]: if Pivoting[0] == "1": return User, Domain print "[+] Username: %s is whitelisted, forwarding credentials."%(User) @@ -165,7 +165,7 @@ def ParseHTTPHash(data, key, client, UserToRelay, Host, Pivoting): pass else: print "[+] Received NTLMv2 hash from: %s %s"%(client, ShowSmallResults((client,445))) - if User in UserToRelay or "ALL" in UserToRelay: + if User in UserToRelay or "ALL" in UserToRelay or [x for x in UserToRelay if re.match(x+"$",User)]: if Pivoting[0] == "1": return User, Domain @@ -210,7 +210,7 @@ def ParseSMBHash(data,client, challenge,UserToRelay,Host,Pivoting): #Parse SMB pass else: print "[+] Received NTLMv1 hash from: %s %s"%(client, ShowSmallResults((client,445))) - if Username in UserToRelay or "ALL" in UserToRelay: + if Username in UserToRelay or "ALL" in UserToRelay or [x for x in UserToRelay if re.match(x+"$",User)]: if Pivoting[0] == "1": return Username, Domain @@ -244,7 +244,7 @@ def ParseSMBHash(data,client, challenge,UserToRelay,Host,Pivoting): #Parse SMB pass else: print "[+] Received NTLMv2 hash from: %s %s"%(client, ShowSmallResults((client,445))) - if Username in UserToRelay or "ALL" in UserToRelay: + if Username in UserToRelay or "ALL" in UserToRelay or [x for x in UserToRelay if re.match(x+"$",User)]: if Pivoting[0] == "1": return Username, Domain print "[+] Username: %s is whitelisted, forwarding credentials."%(Username)