Update configuration file

AdBleed.conf

@@ -5,10 +5,14 @@
 DnsQueryTimeout = 1
 # IP of local DNS server to test
 ;SpecialDNS = 1.1.1.1           # Might be superfluous due to /etc/resolv.conf
+# Minimum percentage of hosts to result in the same IP to classify DNS server as Pi-hole
+SimilarResp = 75
+# Number of hosts to randomly test at the DNS server
+NumberOfHosts = 50
 
 [Poisoning]
 # Type of DNS poisoning to execute
-PoisonType = ads                # Replace the IPs of requests that Pi-hole says are ads
+PoisonType = ads
 ;PoisonType = complete          # Replace every DNS request
 
 # Which IP should be substituted

src/configuration.py

@@ -1,46 +1,61 @@
 import configparser
+import os
 
 class Configuration:
-    config
-    path
-    
+    config = None
+    path = None
+
     dnsQueryTimeout = ("Discovery", "DnsQueryTimeout")
+    similarResponses = ("Discovery", "SimilarResp")
+    noOfHosts = ("Discovery", "NumberOfHosts")
     poisonType = ("Poisoning", "PoisonType")
     replaceIP = ("Poisoning", "ReplaceIP")
 
-    def __init__():
-        path = os.path.dirname(__file__) + "../AdBleed.conf"
-        config = configparser.ConfigParser()
-        config.read(path)
-
-    def set(section, variable, value):
-        config.set(section, variable, value)
-        with open(path, "wb") as file:
-            config.write(file)
-
-    def get(section, variable):
-        return config.get(section, variable)
+    def __init__(self):
+        self.path = os.path.dirname(__file__) + "/../AdBleed.conf"
+        self.config = configparser.ConfigParser()
+        self.config.read(self.path)
+
+    def setConf(self, section, variable, value):
+        self.config.set(section, variable, value)
+        with open(self.path, "wb") as file:
+            self.config.write(file)
 
+    def getConf(self, section, variable):
+        return self.config.get(section, variable)
 
-    # --------------------
+    # |------------------|
     # | Specific get/set |
-    # --------------------
-    def setDNSQueryTimeout(value):
-        set(dnsQueryTimeout[0], dnsQueryTimeout[1], value)
-
-    def getDNSQueryTimeout():
-        return get(dnsQueryTimeout[0], dnsQueryTimeout[1])
+    # |------------------|
+    def setDNSQueryTimeout(self, value):
+        self.setConf(self.dnsQueryTimeout[0], self.dnsQueryTimeout[1], str.encode(value))
 
-    def setPoisonType(value):
-        set(poisonType[0], poisonType[1], value)
-
-    def getPoisonType():
-        return get(poisonType[0], poisonType[1])
+    def getDNSQueryTimeout(self):
+        return int(self.getConf(self.dnsQueryTimeout[0], self.dnsQueryTimeout[1]))
+
+    def setPoisonType(self, value):
+        self.setConf(self.poisonType[0], self.poisonType[1], str.encode(value))
+
+    def getPoisonType(self):
+        return self.getConf(self.poisonType[0], self.poisonType[1])
+
+    def setReplaceIP(self, value):
+        sel.fsetConf(self.replaceIP[0], self.replaceIP[1], str.encode(value))
+
+    def getReplaceIP(self):
+        return self.getConf(self.replaceIP[0], self.replaceIP[1])
 
-    def setReplaceIP(value):
-        set(replaceIP[0], replaceIP[1], value)
+    def setSimilarResponses(self, value):
+        self.setConf(self.similarResponses[0], self.similarResponses[1], str.encode(value))
 
-    def getReplaceIP():
-        return get(replaceIP[0], replaceIP[1])
+    def getSimilarResponses(self):
+        return int(self.getConf(self.similarResponses[0], self.similarResponses[1]))
+
+    def setNumberOfHosts(self, value):
+        self.setConf(self.noOfHosts[0], self.noOfHosts[1], str.encode(value))
+
+    def getNumberOfHosts(self):
+        return int(self.getConf(self.noOfHosts[0], self.noOfHosts[1]))
 
     pass
+