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

Merge branch 'master' into otp

Browse source
This commit is contained in:
terrtia 2024-08-13 11:43:52 +02:00
commit d4df580b92
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/lib/Tracker.py
View file

@ -215,6 +215,8 @@ class Tracker:
def del_filters(self, tracker_type, to_track): def del_filters(self, tracker_type, to_track):
filters = self.get_filters() filters = self.get_filters()
if not filters:
filters = get_objects_tracked()
for obj_type in filters: for obj_type in filters:
r_tracker.srem(f'trackers:objs:{tracker_type}:{obj_type}', to_track) r_tracker.srem(f'trackers:objs:{tracker_type}:{obj_type}', to_track)
r_tracker.srem(f'trackers:uuid:{tracker_type}:{to_track}', f'{self.uuid}:{obj_type}') r_tracker.srem(f'trackers:uuid:{tracker_type}:{to_track}', f'{self.uuid}:{obj_type}')
@ -541,12 +543,12 @@ class Tracker:
r_tracker.sadd(f'trackers:objs:{tracker_type}:{obj_type}', to_track) r_tracker.sadd(f'trackers:objs:{tracker_type}:{obj_type}', to_track)
r_tracker.sadd(f'trackers:uuid:{tracker_type}:{to_track}', f'{self.uuid}:{obj_type}') r_tracker.sadd(f'trackers:uuid:{tracker_type}:{to_track}', f'{self.uuid}:{obj_type}')
self._set_field('last_change', time.time())
# Refresh Trackers # Refresh Trackers
trigger_trackers_refresh(tracker_type) trigger_trackers_refresh(tracker_type)
if tracker_type != old_type: if tracker_type != old_type:
trigger_trackers_refresh(old_type) trigger_trackers_refresh(old_type)
self._set_field('last_change', time.time())
return self.uuid return self.uuid
def delete(self): def delete(self):

2
files/misp-galaxy

@ -1 +1 @@
Subproject commit 89e39ddb3f4414885960aeb67e7023e288a43ee2 Subproject commit b57d77a66371a1397c9f481e040b88c212bdcac5

2
files/misp-taxonomies

@ -1 +1 @@
Subproject commit e8892b6cf91551d93acf94ce52a36a7112e756cc Subproject commit 15efab5d89a575e5da29db399559117b17793ca9

4
var/www/templates/crawler/crawler_splash/settings_crawler.html
View file

@ -92,6 +92,10 @@
</div> </div>
</div> </div>
<a href="{{ url_for('crawler_splash.crawlers_dashboard_captures_delete') }}">
<button type="button" class="btn btn-danger">Delete Lacus Queues</button>
</a>
{# <div class="card border-secondary">#} {# <div class="card border-secondary">#}
{# <div class="card-body text-dark">#} {# <div class="card-body text-dark">#}
{# <h5 class="card-title">All Proxies:</h5>#} {# <h5 class="card-title">All Proxies:</h5>#}

2
var/www/templates/crawler/crawler_splash/showDomain.html
View file

@ -370,7 +370,7 @@
<table id="tabletitle" class="table table-striped"> <table id="tabletitle" class="table table-striped">
<thead class="thead-dark"> <thead class="thead-dark">
<tr> <tr>
<th>Tilte</th> <th>Title</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>