web interface: fix displaying profiles

Author: AlyaGomaa

webinterface/analysis/analysis.py

@@ -122,17 +122,23 @@ def set_profile_tws():
     """
     Set profiles and their timewindows into the tree.
     Blocked are highligted in red.
-    :return: (profile, [tw, blocked], blocked)
     """
-    data = {}
-
+    profiles_dict = {}
+    # Fetch profiles
     profiles = db.get_profiles()
-    blocked_profiles = db.get_malicious_profiles()
     for profileid in profiles:
-        blocked: bool = profileid in blocked_profiles
-        profile_ip = profileid.split("_")[-1]
-        data.update({"profile": profile_ip, "blocked": blocked})
+        profile_word, profile_ip = profileid.split("_")
+        profiles_dict[profile_ip] = False
+
+    if blocked_profiles := db.get_malicious_profiles():
+        for profile in blocked_profiles:
+            blocked_ip = profile.split("_")[-1]
+            profiles_dict[blocked_ip] = True
 
+    data = [
+        {"profile": profile_ip, "blocked": blocked_state}
+        for profile_ip, blocked_state in profiles_dict.items()
+    ]
     return {"data": data}
 
 

webinterface/database/database.py

@@ -52,6 +52,7 @@ def get_db_manager_obj(self, port: int = False) -> Optional[DBManager]:
                 output_dir,
                 port,
                 start_redis_server=False,
+                start_sqlite=False,
             )
         except RuntimeError:
             return

webinterface/general/general.py

@@ -22,6 +22,7 @@ def index():
 def set_blocked_profiles_and_tws():
     """
     Function to set blocked profiles and tws
+    blocked here means only blocked through the firewall
     """
     blocked_profiles_and_tws = db.get_blocked_profiles_and_timewindows()
     data = []