AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-29 17:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [retro hunts] remove objects

Browse source
This commit is contained in:
terrtia 2024-11-25 15:15:10 +01:00
parent 72afd3ef62
commit e0ae20968d
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/lib/Tracker.py
View file

@ -780,7 +780,7 @@ def get_trackers_graph_by_day(l_trackers, num_day=31, date_from=None, date_to=No
def get_trackers_dashboard(user_org, user_id): def get_trackers_dashboard(user_org, user_id):
trackers = [] trackers = []
for raw in r_tracker.lrange('trackers:dashboard', 0, -1): for raw in r_tracker.lrange('trackers:dashboard', 0, -1):
tracker_uuid, timestamp, obj_type, subtype, obj_id = raw.split(':', 4) tracker_uuid, timestamp, obj_gid = raw.split(':', 2)
tracker = Tracker(tracker_uuid) tracker = Tracker(tracker_uuid)
if not tracker.check_level(user_org, user_id): if not tracker.check_level(user_org, user_id):
continue continue
@ -789,17 +789,20 @@ def get_trackers_dashboard(user_org, user_id):
meta['type'] = 'Tracker DELETED' meta['type'] = 'Tracker DELETED'
timestamp = datetime.datetime.fromtimestamp(float(timestamp)).strftime('%Y-%m-%d %H:%M:%S') timestamp = datetime.datetime.fromtimestamp(float(timestamp)).strftime('%Y-%m-%d %H:%M:%S')
meta['timestamp'] = timestamp meta['timestamp'] = timestamp
meta['obj'] = obj_gid
meta['tags'] = list(meta['tags'])
trackers.append(meta) trackers.append(meta)
return trackers return trackers
def get_user_dashboard(user_id): # TODO SORT + REMOVE OLDER ROWS (trim) def get_user_dashboard(user_id): # TODO SORT + REMOVE OLDER ROWS (trim)
trackers = [] trackers = []
for raw in r_tracker.lrange(f'trackers:user:{user_id}', 0, -1): for raw in r_tracker.lrange(f'trackers:user:{user_id}', 0, -1):
tracker_uuid, timestamp, obj_type, subtype, obj_id = raw.split(':', 4) tracker_uuid, timestamp, obj_gid = raw.split(':', 2)
tracker = Tracker(tracker_uuid) tracker = Tracker(tracker_uuid)
meta = tracker.get_meta(options={'tags'}) meta = tracker.get_meta(options={'tags'})
timestamp = datetime.datetime.fromtimestamp(float(timestamp)).strftime('%Y-%m-%d %H:%M:%S') timestamp = datetime.datetime.fromtimestamp(float(timestamp)).strftime('%Y-%m-%d %H:%M:%S')
meta['timestamp'] = timestamp meta['timestamp'] = timestamp
meta['obj'] = obj_gid
trackers.append(meta) trackers.append(meta)
return trackers return trackers
@ -1028,6 +1031,9 @@ def api_add_tracker(dict_input, org, user_id):
res = item_basic.verify_sources_list(filters['item']['sources']) res = item_basic.verify_sources_list(filters['item']['sources'])
if res: if res:
return res return res
elif obj_type == 'message':
pass
# TODO Check IF not at the same time in sources + excludes
else: else:
return {"status": "error", "reason": "Invalid Filter sources"}, 400 return {"status": "error", "reason": "Invalid Filter sources"}, 400
elif filter_name == 'subtypes': elif filter_name == 'subtypes':
@ -1701,10 +1707,21 @@ class RetroHunt:
state = 'pending' state = 'pending'
self._set_state(state) self._set_state(state)
def delete_objs(self):
for obj_type in get_objects_retro_hunted():
for obj in self.get_objs_by_type(obj_type):
subtype, obj_id = obj.split(':', 1)
# match by object type:
r_tracker.srem(f'retro_hunt:objs:{self.uuid}:{obj_type}', f'{subtype}:{obj_id}')
# MAP object -> retro hunt
r_tracker.srem(f'obj:retro_hunts:{obj_type}:{subtype}:{obj_id}', self.uuid)
def delete(self): def delete(self):
if self.is_running() and self.get_state() not in ['completed', 'paused']: if self.is_running() and self.get_state() not in ['completed', 'paused']:
return None return None
self.delete_objs()
# Delete custom rule # Delete custom rule
rule = self.get_rule() rule = self.get_rule()
if not is_default_yara_rule(rule): if not is_default_yara_rule(rule):

6
bin/lib/module_extractor.py
View file

@ -188,7 +188,11 @@ def get_tracker_match(user_org, user_id, obj, content):
if not retro_hunt.check_level(user_org): if not retro_hunt.check_level(user_org):
continue continue
rule = retro_hunt.get_rule(r_compile=True) try:
rule = retro_hunt.get_rule(r_compile=True)
except yara.Error:
retro_hunt.delete_objs()
rule.match(data=content.encode(), callback=_get_yara_match, rule.match(data=content.encode(), callback=_get_yara_match,
which_callbacks=yara.CALLBACK_MATCHES, timeout=30) which_callbacks=yara.CALLBACK_MATCHES, timeout=30)
yara_match = r_cache.smembers(f'extractor:yara:match:{r_key}') yara_match = r_cache.smembers(f'extractor:yara:match:{r_key}')