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

RE-CR: tiny corrections

This commit is contained in:
maor.rayzin 2018-10-31 14:28:52 +02:00
parent 707c88434c
commit 3bf917af80
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/monkey_island/cc/services/groups_and_users_consts.py
View File

@ -1,5 +1,6 @@
"""This file will include consts values regarding the groupsandusers collection""" """This file will include consts values regarding the groupsandusers collection"""
USERTYPE = 1 __author__ = 'maor.rayzin'
GROUPTYPE = 2 USERTYPE = 1
GROUPTYPE = 2

8
monkey/monkey_island/cc/services/wmi_handler.py
View File

@ -1,5 +1,5 @@
from cc.database import mongo from cc.database import mongo
from cc.services.groups_and_users_consts import USERTYPE from cc.services.groups_and_users_consts import USERTYPE, GROUPTYPE
__author__ = 'maor.rayzin' __author__ = 'maor.rayzin'
@ -66,7 +66,7 @@ class WMIHandler(object):
base_entity['SAM_secret'] = self.users_secrets.get(base_entity['name'], {}).get('sam') base_entity['SAM_secret'] = self.users_secrets.get(base_entity['name'], {}).get('sam')
base_entity['secret_location'] = [] base_entity['secret_location'] = []
base_entity['type'] = 1 base_entity['type'] = USERTYPE
self.info_for_mongo[base_entity.get('SID')] = base_entity self.info_for_mongo[base_entity.get('SID')] = base_entity
def add_groups_to_collection(self): def add_groups_to_collection(self):
@ -76,7 +76,7 @@ class WMIHandler(object):
else: else:
base_entity = self.build_entity_document(group, self.monkey_id) base_entity = self.build_entity_document(group, self.monkey_id)
base_entity['entities_list'] = [] base_entity['entities_list'] = []
base_entity['type'] = 2 base_entity['type'] = GROUPTYPE
self.info_for_mongo[base_entity.get('SID')] = base_entity self.info_for_mongo[base_entity.get('SID')] = base_entity
def create_group_user_connection(self): def create_group_user_connection(self):
@ -150,6 +150,6 @@ class WMIHandler(object):
{'$addToSet': {'admin_on_machines': machine_id}}) {'$addToSet': {'admin_on_machines': machine_id}})
entity_details = mongo.db.groupsandusers.find_one({'SID': sid}, entity_details = mongo.db.groupsandusers.find_one({'SID': sid},
{'type': USERTYPE, 'entities_list': 1}) {'type': USERTYPE, 'entities_list': 1})
if entity_details.get('type') == 2: if entity_details.get('type') == GROUPTYPE:
self.add_admin(entity_details, machine_id) self.add_admin(entity_details, machine_id)