p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Change full logs cosmetics

This commit is contained in:
Itay Mizeretz 2017-09-14 19:01:42 +03:00
parent 7ef2e3cabc
commit e37a0a9863
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monkey_island/cc/resources/telemetry.py
View File

@ -32,7 +32,7 @@ class Telemetry(flask_restful.Resource):
if timestamp:
find_filter['timestamp'] = {'$gt': dateutil.parser.parse(timestamp)}
result['objects'] = [x for x in mongo.db.telemetry.find(find_filter)]
result['objects'] = self.telemetry_to_displayed_telemetry(mongo.db.telemetry.find(find_filter))
return result
def post(self):
@ -60,6 +60,23 @@ class Telemetry(flask_restful.Resource):
return mongo.db.telemetry.find_one_or_404({"_id": telem_id})
def telemetry_to_displayed_telemetry(self, telemetry):
monkey_guid_dict = {}
monkeys = mongo.db.monkey.find({})
for monkey in monkeys:
monkey_guid_dict[monkey["guid"]] = NodeService.get_monkey_label(monkey)
objects = []
for x in telemetry:
telem_monkey_guid = x.pop("monkey_guid")
monkey_label = monkey_guid_dict.get(telem_monkey_guid)
if monkey_label is None:
monkey_label = telem_monkey_guid
x["monkey"] = monkey_label
objects.append(x)
return objects
def get_edge_by_scan_or_exploit_telemetry(self, telemetry_json):
dst_ip = telemetry_json['data']['machine']['ip_addr']
src_monkey = NodeService.get_monkey_by_guid(telemetry_json['monkey_guid'])

8
monkey_island/cc/ui/src/components/pages/FullLogsPage.js
View File

@ -7,10 +7,10 @@ const renderJson = (val, row) => <JSONTree data={val} level={1} theme="eighties"
const renderTime = (val, row) => val.split('.')[0];
const columns = [
{ title: 'Type', prop: 'telem_type' },
{ title: 'Monkey ID', prop: 'monkey_guid' },
{ title: 'Time', prop: 'timestamp', render: renderTime},
{ title: 'More Info', prop: 'data', render: renderJson, width: '40%' }
{ title: 'Monkey', prop: 'monkey' },
{ title: 'Type', prop: 'telem_type' },
{ title: 'Details', prop: 'data', render: renderJson, width: '40%' }
];
class FullLogsPageComponent extends React.Component {
@ -30,7 +30,7 @@ class FullLogsPageComponent extends React.Component {
render() {
return (
<Col xs={12}>
<h1 className="page-title">Full Logs</h1>
<h1 className="page-title">Monkey Telemetry</h1>
<div className="data-table-container">
<DataTable
keys="name"