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

fixed minor bugfix on recent merge

Browse source
This commit is contained in:
lgandx 2018-11-28 21:07:39 -03:00
commit 38e721da98
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
tools/RunFinger.py
View file

@ -1,7 +1,3 @@
if options.grep_output:
func = ShowSmallResults
else:
func = ShowResults
#!/usr/bin/env python #!/usr/bin/env python
# This file is part of Responder, a network take-over set of tools # This file is part of Responder, a network take-over set of tools
# created and maintained by Laurent Gaffie. # created and maintained by Laurent Gaffie.
@ -42,6 +38,7 @@ if options.TARGET is None:
Timeout = 2 Timeout = 2
Host = options.TARGET Host = options.TARGET
MS17010Check = options.all
class Packet(): class Packet():
fields = OrderedDict([ fields = OrderedDict([
@ -210,14 +207,22 @@ def ShowResults(Host):
Hostname, DomainJoined, Time = DomainGrab(Host) Hostname, DomainJoined, Time = DomainGrab(Host)
Signing, OsVer, LanManClient = SmbFinger(Host) Signing, OsVer, LanManClient = SmbFinger(Host)
NullSess = check_smb_null_session(Host) NullSess = check_smb_null_session(Host)
Ms17010 = check_ms17_010(Host) if MS17010Check:
print ("Retrieving information for %s..."%Host[0]) Ms17010 = check_ms17_010(Host)
print ("SMB signing:", Signing) print "Retrieving information for %s..."%Host[0]
print ("Null Sessions Allowed:", NullSess) print "SMB signing:", Signing
print ("Vulnerable to MS17-010:", Ms17010) print "Null Sessions Allowed:", NullSess
print ("Server Time:", Time[1]) print "Vulnerable to MS17-010:", Ms17010
print ("OS version: '%s'\nLanman Client: '%s'"%(OsVer, LanManClient)) print "Server Time:", Time[1]
print ("Machine Hostname: '%s'\nThis machine is part of the '%s' domain\n"%(Hostname, DomainJoined)) print "OS version: '%s'\nLanman Client: '%s'"%(OsVer, LanManClient)
print "Machine Hostname: '%s'\nThis machine is part of the '%s' domain\n"%(Hostname, DomainJoined)
else:
print "Retrieving information for %s..."%Host[0]
print "SMB signing:", Signing
print "Null Sessions Allowed:", NullSess
print "Server Time:", Time[1]
print "OS version: '%s'\nLanman Client: '%s'"%(OsVer, LanManClient)
print "Machine Hostname: '%s'\nThis machine is part of the '%s' domain\n"%(Hostname, DomainJoined)
except: except:
pass pass
@ -230,12 +235,18 @@ def ShowSmallResults(Host):
return False return False
try: try:
Hostname, DomainJoined, Time = DomainGrab(Host) if MS17010Check:
Signing, OsVer, LanManClient = SmbFinger(Host) Hostname, DomainJoined, Time = DomainGrab(Host)
NullSess = check_smb_null_session(Host) Signing, OsVer, LanManClient = SmbFinger(Host)
Ms17010 = check_ms17_010(Host) NullSess = check_smb_null_session(Host)
message_ms17010 = ", MS17-010: {}".format(Ms17010) Ms17010 = check_ms17_010(Host)
print("['{}', Os:'{}', Domain:'{}', Signing:'{}', Time:'{}', Null Session: {} {}".format(Host[0], OsVer, DomainJoined, Signing, Time[1],NullSess, message_ms17010)) message_ms17010 = ", MS17-010: {}".format(Ms17010)
print("['{}', Os:'{}', Domain:'{}', Signing:'{}', Time:'{}', Null Session: {} {}".format(Host[0], OsVer, DomainJoined, Signing, Time[1],NullSess, message_ms17010))
else:
Hostname, DomainJoined, Time = DomainGrab(Host)
Signing, OsVer, LanManClient = SmbFinger(Host)
NullSess = check_smb_null_session(Host)
print("['{}', Os:'{}', Domain:'{}', Signing:'{}', Time:'{}', Null Session: {}".format(Host[0], OsVer, DomainJoined, Signing, Time[1],NullSess))
except Exception as err: except Exception as err:
pass pass
@ -260,4 +271,4 @@ def RunFinger(Host):
else: else:
ShowResults((Host,445)) ShowResults((Host,445))
RunFinger(Host) RunFinger(Host)