infosecn1nja
/
Empire
mirror of https://github.com/infosecn1nja/Empire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolved conflicts & fixed agent output

3.0-Beta
chris 2018-03-14 18:35:24 -04:00
parent 5ad40ad388
commit a7d2dddc91
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/common/empire.py
View File

@ -1783,6 +1783,7 @@ class PowerShellAgentMenu(SubMenu):
self.sessionID = sessionID self.sessionID = sessionID
self.doc_header = 'Agent Commands' self.doc_header = 'Agent Commands'
dispatcher.connect(self.handle_agent_event, sender=dispatcher.Any)
# try to resolve the sessionID to a name # try to resolve the sessionID to a name
name = self.mainMenu.agents.get_agent_name_db(sessionID) name = self.mainMenu.agents.get_agent_name_db(sessionID)
@ -1802,6 +1803,22 @@ class PowerShellAgentMenu(SubMenu):
# def preloop(self): # def preloop(self):
# traceback.print_stack() # traceback.print_stack()
def handle_agent_event(self, signal, sender):
"""
Handle agent event signals
"""
# load up the signal so we can inspect it
try:
signal_data = json.loads(signal)
except ValueError:
print(helpers.color("[!] Error: bad signal recieved {} from sender {}".format(signal, sender)))
return
if '{} returned results'.format(self.sessionID) in signal:
results = self.mainMenu.agents.get_agent_results_db(self.sessionID)
if results:
print(helpers.color(results))
def default(self, line): def default(self, line):
"Default handler" "Default handler"
@ -2742,6 +2759,8 @@ class PythonAgentMenu(SubMenu):
self.doc_header = 'Agent Commands' self.doc_header = 'Agent Commands'
dispatcher.connect(self.handle_agent_event, sender=dispatcher.Any)
# try to resolve the sessionID to a name # try to resolve the sessionID to a name
name = self.mainMenu.agents.get_agent_name_db(sessionID) name = self.mainMenu.agents.get_agent_name_db(sessionID)
@ -2760,6 +2779,22 @@ class PythonAgentMenu(SubMenu):
if results: if results:
print "\n" + results.rstrip('\r\n') print "\n" + results.rstrip('\r\n')
def handle_agent_event(self, signal, sender):
"""
Handle agent event signals
"""
# load up the signal so we can inspect it
try:
signal_data = json.loads(signal)
except ValueError:
print(helpers.color("[!] Error: bad signal recieved {} from sender {}".format(signal, sender)))
return
if '{} returned results'.format(self.sessionID) in signal:
results = self.mainMenu.agents.get_agent_results_db(self.sessionID)
if results:
print(helpers.color(results))
def default(self, line): def default(self, line):
"Default handler" "Default handler"
line = line.strip() line = line.strip()