diff --git a/bin/lib/Tracker.py b/bin/lib/Tracker.py index a0d7d10b..954cda50 100755 --- a/bin/lib/Tracker.py +++ b/bin/lib/Tracker.py @@ -215,6 +215,8 @@ class Tracker: def del_filters(self, tracker_type, to_track): filters = self.get_filters() + if not filters: + filters = get_objects_tracked() for obj_type in filters: 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}') @@ -541,12 +543,12 @@ class Tracker: 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}') + self._set_field('last_change', time.time()) + # Refresh Trackers trigger_trackers_refresh(tracker_type) if tracker_type != old_type: trigger_trackers_refresh(old_type) - - self._set_field('last_change', time.time()) return self.uuid def delete(self): diff --git a/files/misp-galaxy b/files/misp-galaxy index 89e39ddb..b57d77a6 160000 --- a/files/misp-galaxy +++ b/files/misp-galaxy @@ -1 +1 @@ -Subproject commit 89e39ddb3f4414885960aeb67e7023e288a43ee2 +Subproject commit b57d77a66371a1397c9f481e040b88c212bdcac5 diff --git a/files/misp-taxonomies b/files/misp-taxonomies index e8892b6c..15efab5d 160000 --- a/files/misp-taxonomies +++ b/files/misp-taxonomies @@ -1 +1 @@ -Subproject commit e8892b6cf91551d93acf94ce52a36a7112e756cc +Subproject commit 15efab5d89a575e5da29db399559117b17793ca9 diff --git a/var/www/templates/crawler/crawler_splash/settings_crawler.html b/var/www/templates/crawler/crawler_splash/settings_crawler.html index b2526122..cb3ac758 100644 --- a/var/www/templates/crawler/crawler_splash/settings_crawler.html +++ b/var/www/templates/crawler/crawler_splash/settings_crawler.html @@ -92,6 +92,10 @@ + + + + {#
#} {#
#} {#
All Proxies:
#} diff --git a/var/www/templates/crawler/crawler_splash/showDomain.html b/var/www/templates/crawler/crawler_splash/showDomain.html index b2e2f0b3..ea8075e8 100644 --- a/var/www/templates/crawler/crawler_splash/showDomain.html +++ b/var/www/templates/crawler/crawler_splash/showDomain.html @@ -370,7 +370,7 @@ - +
TilteTitle