Refactored database and test for profileId from IP

Author: A-atmos

slips_files/core/database/database.py

@@ -364,7 +364,7 @@ def addProfile(self, profileid, starttime, duration):
             if not self.should_add(profileid):
                 return False
             # Add the profile to the index. The index is called prefix + separator + 'profiles'
-            self.r.sadd(self.prefix + self.separator + 'profiles', str(profileid))
+            self.r.sadd(self.prefix + self.separator + 'profiles', self.prefix + self.separator + str(profileid))
             # Create the hashmap with the profileid. The hasmap of each profile is named with the profileid
             # Add the start time of profile
             self.r.hset(self.prefix + self.separator + str(profileid), 'starttime', starttime)
@@ -724,7 +724,7 @@ def getProfileIdFromIP(self, daddr_as_obj):
         """Receive an IP and we want the profileid"""
         try:
             profileid = f'profile{self.separator}{str(daddr_as_obj)}'
-            if data := self.r.sismember('profiles', profileid):
+            if data := self.r.sismember(self.prefix + self.separator +'profiles', self.prefix + self.separator + str(profileid)):
                 return profileid
             return False
         except redis.exceptions.ResponseError as inst:

tests/test_database.py

@@ -95,7 +95,7 @@ def test_getProfileIdFromIP(outputQueue):
     os.system('./slips.py -c config/slips.conf -cc')
 
     # add a profile
-    database.addProfile(f'{prefix}_profile_192.168.1.1', '00:00', '1')
+    database.addProfile(f'profile_192.168.1.1', '00:00', '1')
     # try to retrieve it
     assert database.getProfileIdFromIP(test_ip) is not False