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

DB queries fix 

Modification time relevant for UI updating accordingly.
This commit is contained in:
itsikkes 2016-07-26 18:52:25 +03:00
parent 16c1d75d01
commit 63d8c4ed12
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey_island/cc/admin/ui/index.html
View File

@ -84,7 +84,7 @@
<div id="info" class="panel-body panel-collapse collapse in"> <div id="info" class="panel-body panel-collapse collapse in">
<div> <div>
Num of Monkeys: <label id="infoNumOfMonkeys">0</label> (<label id="infoNumOfParents">0</label> exploiting were done)<br/> Num of Monkeys: <label id="infoNumOfMonkeys">0</label> (<label id="infoNumOfParents">0</label> exploiting were done)<br/>
Monkyes Alive: <label id="infoNumOfAlive">0</label><br/> Monkeys Alive: <label id="infoNumOfAlive">0</label><br/>
Num of Hosts Not Exploited: <label id="infoNumOfHosts">0</label><br/> Num of Hosts Not Exploited: <label id="infoNumOfHosts">0</label><br/>
Num of Tunnels Used: <label id="infoNumOfTunnels">0</label><br/> Num of Tunnels Used: <label id="infoNumOfTunnels">0</label><br/>
</div> </div>

10
monkey_island/cc/main.py
View File

@ -165,20 +165,20 @@ class Telemetry(restful.Resource):
host = telemetry_json['data'].split(":")[-2].replace("//", "") host = telemetry_json['data'].split(":")[-2].replace("//", "")
tunnel_host = mongo.db.monkey.find_one({"ip_addresses": host}) tunnel_host = mongo.db.monkey.find_one({"ip_addresses": host})
mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']}, mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
{'$set': {'tunnel_guid': tunnel_host.get('guid')}}, {'$set': {'tunnel_guid': tunnel_host.get('guid'), 'modifytime': datetime.now()}},
upsert=False) upsert=False)
else: else:
mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']}, mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
{'$unset': {'tunnel_guid': ''}}, {'$unset': {'tunnel_guid': ''}, 'modifytime': datetime.now()},
upsert=False) upsert=False)
elif telemetry_json.get('telem_type') == 'state': elif telemetry_json.get('telem_type') == 'state':
if telemetry_json['data']['done']: if telemetry_json['data']['done']:
mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']}, mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
{'$set': {'dead': True}}, {'$set': {'dead': True, 'modifytime': datetime.now()}},
upsert=False) upsert=False)
else: else:
mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']}, mongo.db.monkey.update({"guid": telemetry_json['monkey_guid']},
{'$set': {'dead': False}}, {'$set': {'dead': False, 'modifytime': datetime.now()}},
upsert=False) upsert=False)
except: except:
pass pass
@ -272,7 +272,7 @@ def output_json(obj, code, headers=None):
def update_dead_monkeys(): def update_dead_monkeys():
mongo.db.monkey.update( mongo.db.monkey.update(
{'keepalive': {'$lte': datetime.now() - timedelta(minutes=10)}, 'dead': {'$ne': True}}, {'keepalive': {'$lte': datetime.now() - timedelta(minutes=10)}, 'dead': {'$ne': True}},
{'$set': {'dead': True, 'modifytime': datetime.now()}}, upsert=False) {'$set': {'dead': True, 'modifytime': datetime.now()}}, upsert=False, multi=True)
@app.route('/admin/<path:path>') @app.route('/admin/<path:path>')