Bug Fix: Allow for two simultanious readers.

Author: IPQualityScore

IPQualityScore/BinaryOption.py

@@ -21,13 +21,11 @@ def Create(value):
     IPV6MAP             = 1 << 1
     BLACKLISTFILE       = 1 << 2
     BINARYDATA          = 1 << 7
-
     TREEDATA            = 1 << 2
     STRINGDATA          = 1 << 3
     SMALLINTDATA        = 1 << 4
     INTDATA             = 1 << 5
     FLOATDATA           = 1 << 6
-
     ISPROXY             = 1 << 0
     ISVPN               = 1 << 1
     ISTOR               = 1 << 2
@@ -36,7 +34,6 @@ def Create(value):
     RECENTABUSE         = 1 << 5
     ISBLACKLISTED       = 1 << 6
     ISPRIVATE           = 1 << 7
-
     ISMOBILE            = 1 << 0
     HASOPENPORTS        = 1 << 1
     ISHOSTINGPROVIDER   = 1 << 2
@@ -45,12 +42,12 @@ def Create(value):
     PUBLICACCESSPOINT   = 1 << 5
     RESERVEDONE         = 1 << 6
     RESERVEDTWO         = 1 << 7
-    
     RESERVEDTHREE       = 1 << 0
     RESERVEDFOUR        = 1 << 1
     RESERVEDFIVE        = 1 << 2
     CONNECTIONTYPEONE   = 1 << 3
     CONNECTIONTYPETWO   = 1 << 4
     CONNECTIONTYPETHREE = 1 << 5
     ABUSEVELOCITYONE    = 1 << 6
-    ABUSEVELOCITYTWO    = 1 << 7
+    ABUSEVELOCITYTWO    = 1 << 7
+    

IPQualityScore/DBReader.py

@@ -1,3 +1,4 @@
+
 import os
 from binascii import hexlify
 from socket import error, inet_aton, inet_pton, socket
@@ -21,13 +22,7 @@ class DBReader:
     COLUNN_HEADER = "<P23xB" #"x%s/a23name/Cvalue" null 23null-padded_string UnsigedChar <x23xB
     HEADERS = "<BB3BHL"
 
-    handler  = None
-    tree_start = None
-    tree_end = None
-    record_bytes = None
-    columns = []
-    ipv6 = False
-    blacklistfile = False
+    
 
     def __init__(self, filename:str):
         if not os.path.isfile(filename):
@@ -38,6 +33,13 @@ def __init__(self, filename:str):
         except IOError:
             raise FileReaderException('Invalid or non existant file name specified. Please check the file and try again')
 
+        self.tree_start = None
+        self.tree_end = None
+        self.record_bytes = None
+        self.columns = []
+        self.ipv6 = False
+        self.blacklistfile = False
+
         self.SetupHeaders()
         self.SetupColumns()
         self.SetupTreeHeaders()
@@ -63,7 +65,7 @@ def Fetch(self, ip:str):
             if len(v_literal) <= position:
                 raise IPNotFoundException("Invalid or nonexistant IP address specified for lookup. (EID: 8)")
 
-            if v_literal[position] == "0":
+            if v_literal[position] == 0:
                 pos = self.ReadAt(file_position, self.TREE_BYTE_WIDTH)
                 if len(pos) == 4:
                     file_position = unpack("<L", pos)[0]
@@ -75,15 +77,11 @@ def Fetch(self, ip:str):
             if(self.blacklistfile == False):
                 if(file_position == 0):
                     for i in range(position):
-                        if(v_literal[position - i] == "1"):
-                            l  = list(v_literal)
-                            l[position - i] = "0"
-                            v_literal = ''.join(l)
+                        if(v_literal[position - i] == 1):
+                            l[position - i] = 0
 
                             for n in range(position - i + 1, len(v_literal)):
-                                l  = list(v_literal)
-                                l[n] = "1"
-                                v_literal = ''.join(l)
+                                l[n] = 1
 
                             position = position - i
                             file_position = previous[position]
@@ -191,14 +189,13 @@ def SetupTreeHeaders(self):
         self.tree_end = tree['tree_bytes'] + self.tree_start
 
     def IP2Literal(self,ip):
-        result = ""
-        if(self.ipv6):
+        result = []
+        if (self.ipv6):
             for block in self.Expand(ip).split(":"):
-                result += bin(int(block,16))[2:]
+                for x in bin(int(block, 16))[2:] : result.append((x))
         else:
             for block in ip.split("."):
-                result += bin(int(block,10))[2:].zfill(8)
-
+                for x in bin(int(block, 10))[2:].zfill(8) : result.append(int(x))
         return result
 
     def CreateRecord(self,raw):
@@ -233,6 +230,7 @@ def CreateRecord(self,raw):
                 current_byte += 4
 
             elif column.Name() == "Longitude":
+                
                 value = unpack("<f", raw[current_byte:current_byte+4])[0]
                 record.Longitude(float(value))
                 current_byte += 4
@@ -287,4 +285,5 @@ def IsIPv6(self, ip:str):
             return False
 
     def __del__(self):
-        self.handler.close()
+        if self.handler:
+            self.handler.close()

IPQualityScore/IPQSRecord.py

@@ -2,35 +2,35 @@
 from IPQualityScore.Columns         import Column
 
 class IPQSRecord:
-    __fraudscore = {}
-    __Columns = []
-
-    __IsProxy           = False
-    __IsVPN             = False
-    __IsTOR             = False
-    __IsCrawler         = False
-    __IsBot             = False
-    __IsBlackListed     = False
-    __IsPrivate         = False
-    __IsMobile          = False
-    __RecentAbuse       = False
-    __HasOpenPorts      = False
-    __IsHostingProvider = False
-    __ActiveVPN         = False
-    __ActiveTOR         = False
-    __PublicAccessPoint = False
-    __ConnectionType    = 0
-    __AbuseVelocity     = 0
-    __fraudscore        = {}
-    __Country           = ""
-    __City              = ""
-    __Region            = ""
-    __ISP               = ""
-    __Organization      = ""
-    __Timezone          = ""
-    __Latitude          = 0.0
-    __Longitude         = 0.0
-    __ASN               = 0
+    def __init__(self):
+        self.__fraudscore = {}
+        self.__Columns = []  
+        self.__IsProxy           = False
+        self.__IsVPN             = False
+        self.__IsTOR             = False
+        self.__IsCrawler         = False
+        self.__IsBot             = False
+        self.__IsBlackListed     = False
+        self.__IsPrivate         = False
+        self.__IsMobile          = False
+        self.__RecentAbuse       = False
+        self.__HasOpenPorts      = False
+        self.__IsHostingProvider = False
+        self.__ActiveVPN         = False
+        self.__ActiveTOR         = False
+        self.__PublicAccessPoint = False
+        self.__ConnectionType    = 0
+        self.__AbuseVelocity     = 0
+        self.__fraudscore        = {}
+        self.__Country           = ""
+        self.__City              = ""
+        self.__Region            = ""
+        self.__ISP               = ""
+        self.__Organization      = ""
+        self.__Timezone          = ""
+        self.__Latitude          = 0.0
+        self.__Longitude         = 0.0
+        self.__ASN               = 0
 
     def IsProxy(self, value = None):
         if value != None: