p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eliminate some 'None'-s from the report

This commit is contained in:
Oran Nadler 2018-03-10 23:58:51 -08:00
parent 8807e68177
commit 96c9681bf1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
monkey_island/cc/resources/pthmap.py
View File

@ -96,6 +96,13 @@ class Machine(object):
return eval(user["SID"]) return eval(user["SID"])
if not self.IsDomainController():
for dc in self.GetDomainControllers():
sid = dc.GetSidByUsername(username)
if sid != None:
return sid
return None return None
def GetUsernameBySid(self, sid): def GetUsernameBySid(self, sid):
@ -305,7 +312,12 @@ class Machine(object):
SIDs = set() SIDs = set()
for username in doc["data"]["credentials"]: for username in doc["data"]["credentials"]:
SIDs.add(self.GetSidByUsername(username)) sid = self.GetSidByUsername(username)
if not sid:
sid = "__USERNAME__" + username
SIDs.add(sid)
return SIDs return SIDs
@ -665,7 +677,12 @@ def main():
print """<h4>SIDs cached on this machine</h4>""" print """<h4>SIDs cached on this machine</h4>"""
print """<ul>""" print """<ul>"""
for sid in m.GetCachedSids(): for sid in m.GetCachedSids():
print """<li><a href="#{sid}">{username} ({sid})</a></li>""".format(username=m.GetUsernameBySid(sid), sid=sid) if sid.startswith("__USERNAME__"):
sids = pth.GetSidsByUsername(sid[len("__USERNAME__"):])
if len(sids) == 1:
sid = sids.pop()
print """<li><a href="#{sid}">{username} ({sid})</a></li>""".format(username=pth.GetUsernameBySid(sid), sid=sid)
print """</ul>""" print """</ul>"""
print """<h3>Possible Attackers</h3>""" print """<h3>Possible Attackers</h3>"""
@ -691,7 +708,7 @@ def main():
print """<h3>Matching SIDs</h3>""" print """<h3>Matching SIDs</h3>"""
print """<ul>""" print """<ul>"""
for sid in pth.GetSidsByUsername(username): for sid in pth.GetSidsByUsername(username):
print """<li><a href="#{sid}">{username} ({sid})</a></li>""".format(username=m.GetUsernameBySid(sid), sid=sid) print """<li><a href="#{sid}">{username} ({sid})</a></li>""".format(username=pth.GetUsernameBySid(sid), sid=sid)
print """</ul>""" print """</ul>"""
print "<hr />" print "<hr />"