currently fixed

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/usr/bin/python3"
+}

auth.py

@@ -8,7 +8,7 @@ import bcrypt
 def login(config, user, password, sysid):
     fprint("Attempting to login as " + user)
     filename = sysid + "login.csv"
-    #return True
+    
     #hashpasswd = bcrypt.hashpw(password.encode('utf-8'), user).decode()
     with open(find_data_file(filename), "w", newline="") as f:
         writer = csv.writer(f)

block.py

@@ -10,7 +10,7 @@ import time
 import csv
 import ssh
 
-def get_blocklist(config, appendbad):
+def get_blocklist(config):
     setup_child()
     fprint("Downloading deny list from server")
     data = ssh.check_for_file(config, "BadIPs.csv", "receive")
@@ -21,9 +21,13 @@ def get_blocklist(config, appendbad):
         data2.append(row)
     data2 = [i for i in data2 if i]
     #fprint(data2)
-    for line in appendbad:
-        data2.append(line)
-    
+    data2.append(["N/A", "TCP", "N/A", "N/A", "20.112.52.29", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "20.81.111.85", "80", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "174.143.130.167", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "216.47.134.203", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
+    data2.append(["N/A", "TCP", "N/A", "N/A", "34.111.83.189", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
     
     
     fprint(data2)
@@ -48,7 +52,7 @@ def block_conn(config, datafile, res):
     
     baddata = res
     fprint("Local loaded successfully")
-    goodct = 0
+    
     #fprint(mydata)
     for line in mydata:
         #fprint(line)
@@ -57,25 +61,19 @@ def block_conn(config, datafile, res):
             continue
 
         srcip = line[2].split(":")[0]
-        srcport = line[2].split(":")[1]
         destip = line[3].split(":")[0]
-        destport = line[3].split(":")[1]
         pid = line[5]
         try: 
             pid = int(pid)
         except ValueError:
             continue
-        found = False
+
         for line in baddata:
             #fprint(destip + " " + line[4])
             badsrcip = line[2]
-            badsrcport = line[3]
             baddestip = line[4]
-            baddestport = line[5]
             badpid = line[11]
-            
-            if ((srcip == badsrcip and srcport == badsrcport) or (destip == baddestip and destport == baddestport)) and not pid in badapps:
-                found = True
+            if srcip == badsrcip or destip == baddestip and not pid in badapps:
                 fprint("FLAG " + srcip + " " + destip + " " + str(pid))
                 badapps.append(pid)
                 badips.append(baddestip)
@@ -83,8 +81,4 @@ def block_conn(config, datafile, res):
                 #fprint(badapps)
                 #fprint("FLAG " + srcip + " " + destip + " " + str(pid))
                 #kill(pid)
-            
-        if not found:
-            goodct = goodct + 1
-    
-    return badapps, badips, badlines, goodct
+    return badapps, badips, badlines

config.yml

@@ -2,7 +2,7 @@ core:
   autostart: true
   clockspeed: 20
   interval: 10
-  level: 2
+  level: 0
   localadmin: true
 sftp:
   filepath:
@@ -16,4 +16,4 @@ sftp:
   port: 22
   user: ec2-user
 ui:
-  darkmode: false
+  darkmode: true

ippigeon.py

@@ -18,7 +18,8 @@ import auth
 import panel
 import block
 
-history = list()
+badapps = [756, 278670]
+badips = ["208.59.79.12",]
 displaydata = None
 settings = None
 netdata_res = None
@@ -64,16 +65,13 @@ def netstat_done(res):
 
 def process_done(res):
     if settings["running"] == True:
+        #settings["newdata"] = True
         fprint("uploading to sftp...")
-        #ssh.sftp_send_data(config, datafile, 'send')
-        
+        #ssh.sftp_send_data(res, config, datafile)
         procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'), callback=upload_done)
     
 def upload_done(res):
     settings["block"] = True
-    tmpstat = settings["stats"]
-    tmpstat[2] += 1
-    settings["stats"] = tmpstat
 
 def login_done(res):
     if not res:
@@ -90,16 +88,7 @@ def blockdata_done(res):
     tmpkill = settings["kill"]
     settings["kill"] = False
     #block_res = pool.apply_async(block.block_conn, (config, datafile, res, settings))
-    block_pids, block_ips, block_data, goodct = block.block_conn(config, datafile, res)
-    tmpstat = settings["stats"]
-    tmpstat[1] += goodct
-    if tmpstat[0] > 0 and goodct > 0:
-        tmpstat[4] = 1.0 / (goodct * 100.0 / tmpstat[0])
-    else: 
-        tmpstat[4] = 0.0
-    tmpstat[3] += 1
-    settings["stats"] = tmpstat
-
+    block_pids, block_ips, block_data = block.block_conn(config, datafile, res)
     tmplist = settings["badapps"]
     
     for x in block_pids:
@@ -129,11 +118,6 @@ def blockdata_done(res):
 
     settings["newdata"] = True
         
-def readstat_done(res):
-    settings["stats"] = res
-    fprint("Read stats!" + str(settings["stats"]))
-
-
 def killall():
     kids = active_children()
     for kid in kids:
@@ -155,13 +139,10 @@ def mainloop(pool):
     #print(killme)
     if killme.value > 0:
         #print("killing")
-        util.clear_fwll() # clear the firewall rules before shutdown
         killall()
     #print(res.get(timeout=1))
     if counter == 0: # runs every INTERVAL
         #fprint("start loop")
-        if settings["stats"][1] > 0:
-            util.write_stats(settings["stats"])
         if netdata_res is None or netdata_res.ready():
             #rawdata = netdata_res.get()
             #procdata_res = pool.apply_async(process_netstat, (rawdata))
@@ -173,11 +154,11 @@ def mainloop(pool):
     
     if settings["continueui"] == True:
         settings["continueui"] = False
-        #if ppanel is not None:
+        if ppanel is not None:
             # login panel is already open
-        #    ppanel.terminate()
-        #    ppanel = Process(target=panel.openwindow, args=(displaydata,settings,killme))
-        #    ppanel.start()  
+            ppanel.terminate()
+            ppanel = Process(target=panel.openwindow, args=(displaydata,settings,killme))
+            ppanel.start()  
 
     if settings["showui"] == True:
         settings["showui"] = False
@@ -191,7 +172,7 @@ def mainloop(pool):
         
     
     if settings["block"] == True and settings["running"] == True:
-        blockdata_res = pool.apply_async(block.get_blocklist, (config, settings["appendbad"]), callback=blockdata_done)
+        blockdata_res = pool.apply_async(block.get_blocklist, (config,), callback=blockdata_done)
         #block.get_blocklist(config)
         settings["block"] = False
 
@@ -219,24 +200,14 @@ def mainloop(pool):
 
     if settings["fwll"] == True:
         tmplist = settings["badlines"]
-        tmpstat = settings["stats"]
-        tmpstat[0] += len(tmplist) 
-        settings["stats"] = tmpstat
         settings["badlines"] = list()
         for line in tmplist:
             badproto = line[1]
             badip = line[4]
             badport = line[5]
             fprint("Firewalling " + badip + ":" + str(badport))
-            if (badip, badport) not in history:
-                if win32:
             cmd = 'New-NetFirewallRule -DisplayName "IPPigeon Security Rule ' + badip + ':' + str(badport) + '" -Group "IPPigeon" -Direction Outbound -LocalPort Any -Protocol ' + badproto + ' -Action Block -RemoteAddress ' + badip + ' -RemotePort ' + str(badport)
             run_cmd(cmd)
-                if linux:
-                    cmd = "nft add rule ip ippigeon output ip daddr " + badip + " " + badproto.lower() + " dport " + str(badport) + " drop"
-                    run_cmd(cmd)
-            else:
-                history.append((badip, badport))
         
     
     if settings["applyconfig"] == True:
@@ -288,7 +259,6 @@ if __name__ == '__main__':
             interval = config['core']['interval']
             displaydata = manager.list(range(2)) # data to be printed
             settings = manager.dict() # configuration 
-            # setup shared data variables
             settings["login"] = False
             settings["loggedin"] = False
             settings["showui"] = False
@@ -304,39 +274,19 @@ if __name__ == '__main__':
             settings["fwll"] = 0
             settings["running"] = config["core"]["autostart"]
             settings["newdata"] = False
-            settings["appendbad"] = list()
-            tmp = list()
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "20.112.52.29", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "20.81.111.85", "80", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "174.143.130.167", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "216.47.134.203", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            tmp.append(["N/A", "TCP", "N/A", "N/A", "34.111.83.189", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-            settings["appendbad"] = tmp
-            # connections blocked, total connections allowed, count of data sent, data recieved, ratio blocked-unblocked
-            settings["stats"] = [0, 0, 0, 0, 0.0]
-
             killme = manager.Value('d', 0)
             #killme = False
             # launch background UI app as process
             util.clear_fwll()
             p = Process(target=taskbartool.background, args=(displaydata,settings,killme))
-            
             p.start()   
             #p.join() # not a foreground job, so let's not join it
             keeprunning = True
 
             # initial setup
             #netdata_res = pool.apply_async(netstat, callback=netstat_done)
-            if linux:
-                # clear existing nftables entries, create new table
-                run_cmd("nft delete table ip ippigeon")
-                run_cmd("nft create table ip ippigeon")
-                run_cmd("nft add chain ip ippigeon output { type filter hook output priority 0 \; policy accept\; }")
-                #run_cmd("nft add chain ippigeon filter")
 
-            pool.apply_async(util.read_stats, callback=readstat_done)
+
             # launch loop - non-blocking!
             counter = 0
             while(keeprunning):

netstat.py

@@ -71,45 +71,7 @@ def process(data):
             writer.writerows(output2)
         fprint("done creating csv")
     
-    if linux:
-        output = data.stdout.decode().split('\n') # split stdout into lines
-        output = [i for i in output if i]
-        if output[0].find("Not all processes could be identified") >= 0:
-            fprint("Not enough permissions")
-            raise PermissionError("Unable to acquire netstat data without admin!")
-        output2 = list()
-        output2.append([util.sysid, util.userid, util.sysdom, util.time()]) # add metadata
-        for line in output:
-            string_split = line.split(" ")
-            string_split = [i for i in string_split if i]
-            #fprint("Input: " + str(string_split))
-
-            if string_split[0].find("Active") >= 0 or string_split[0].find("Proto") >= 0:
-                continue
-            
-            if len(string_split) == 6: # no connection status
-                #fprint(string_split)
-                string_split.append(string_split[-1])
-                string_split[-2] = "UNKNOWN"
-                #fprint(string_split)
-            
-            procname = string_split[6]
-            if procname != "-":
-                string_split2 = procname.split("/")
-                procname = string_split2[1]
-                pid = string_split2[0]
-            else:
-                pid = "Unknown"
-            
-            output2.append([procname, string_split[0], string_split[3], string_split[4], string_split[5], pid]) 
-        #fprint(output2)
-        
-        with open(find_data_file(util.datafile), "w", newline="") as f:
-            writer = csv.writer(f)
-            writer.writerows(output2)
-        fprint("done creating csv")
-
-    if macos:
+    if linux or macos:
         output = data.stdout.decode().split('\n') # split stdout into lines
         #output = data.stdout.decode().split(',')
         #fprint("output data: " + str(output))
@@ -165,4 +127,3 @@ def start():
         data = run_cmd("netstat -anv")
         fprint("data acquired")
         return data
-

panel.py

@@ -40,7 +40,7 @@ class OtherFrame(wx.Frame):
     Class used for creating frames other than the main one
     """
     def __init__(self):
-        wx.Frame.__init__(self, None, -1, 'Server Panel', size=(1000, 675))
+        wx.Frame.__init__(self, None, -1, 'Server Panel', size=(1000, 620))
         panel = ServerPanel(self)
         self.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
 
@@ -101,9 +101,6 @@ class LoginPanel(wx.Panel):
         settings["username"] = basicText.GetValue()
         settings["password"] = pwdText.GetValue()
         settings["login"] = True
-        #self.Destroy()
-        self.Close()
-        self.Parent.Close()
         #OtherFrame()
 
     def on_help(self, event):
@@ -145,11 +142,7 @@ class ServerPanel(wx.Panel):
         super().__init__(parent, size=(500, 500))
         #self.SetBackgroundColour((44, 51, 51))
         self.main_sizer = wx.BoxSizer(wx.VERTICAL)
-        self.secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.sub_sizer_left = wx.BoxSizer(wx.VERTICAL)
-        self.sub_sizer_right = wx.BoxSizer(wx.VERTICAL)
-        self.sub_sizer_stats = wx.BoxSizer(wx.VERTICAL)
-        self.sub_sizer_filter = wx.BoxSizer(wx.VERTICAL)
+        secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.row_obj_dict = {}
         self.list_ctrl = wx.ListCtrl(
             self, size=(-1, 400),
@@ -166,111 +159,52 @@ class ServerPanel(wx.Panel):
         else:
             txt = "Status: Not running"
 
-        if settings["loggedin"] == True:
-            logintxt = "Logged in"
-        else:
-            logintxt = "Not logged in"
-        
-        stattxt = "Statistics:\nBlocked Connections: " + str(settings["stats"][0]) + " \nAllowed Connections: " + str(settings["stats"][1]) + " \nUpload count: " + str(settings["stats"][2]) + " \nDownload count: " + str(settings["stats"][3]) + " \nBlock ratio: " + str("{:.4f}".format(settings["stats"][4]))
         self.statustext = wx.StaticText(self, label=txt) # pos=(20,20))
-        self.logintext = wx.StaticText(self, label=logintxt) # pos=(20,20))
-        self.stattext = wx.StaticText(self, label=stattxt)
         #self.main_sizer.Add(tb)
         #main_sizer.SetBackgroundColour((44, 51, 51))
         # self.pnl1.SetBackgroundColour(wx.BLACK)
         self.handle_columns()
         # self.updatedata()
-        
-        self.main_sizer.Add(self.list_ctrl, 1, wx.ALL | wx.EXPAND, 20)
-        self.main_sizer.Add(self.secondary_sizer, 0, wx.ALL | wx.EXPAND, 20)
-        self.secondary_sizer.Add(self.sub_sizer_left, 0, wx.ALL | wx.CENTER, 20)
-        self.secondary_sizer.Add(self.sub_sizer_right, 0, wx.ALL | wx.CENTER, 20)
-        self.secondary_sizer.Add(self.sub_sizer_filter, 0, wx.ALL | wx.CENTER, 20)
-        self.secondary_sizer.Add(self.sub_sizer_stats, 0, wx.ALL | wx.CENTER, 20)
-        self.start_button = wx.Button(self, label='Start IPPigeon')
-        self.start_button.SetBackgroundColour((205, 215, 206))
-        self.start_button.Bind(wx.EVT_BUTTON, self.on_start)
-        #start_button.Bind(wx.EVT_ENTER_WINDOW, self.on_start)
-        self.stop_button = wx.Button(self, label='Stop IPPigeon')
-        self.stop_button.SetBackgroundColour('#F08080')
-        self.secondary_frame_button = wx.Button(self, label='Settings')
-        self.secondary_frame_button.Bind(wx.EVT_BUTTON, self.on_window)
-        # wx.BORDER(stop_button, wx.BORDER_NONE)
-        self.stop_button.Bind(wx.EVT_BUTTON, self.on_stop)
-
-        self.login_button = wx.Button(self, label='Login')
-        #self.login_button.SetBackgroundColour((205, 215, 206))
-        self.login_button.Bind(wx.EVT_BUTTON, self.on_login)
-        self.quit_button = wx.Button(self, label='Quit IPPigeon')
-        #self.login_button.SetBackgroundColour((205, 215, 206))
-        self.quit_button.Bind(wx.EVT_BUTTON, self.on_quit)
-
-        self.blacklist_button = wx.Button(self, label='Add to blacklist')
-        #self.login_button.SetBackgroundColour((205, 215, 206))
-        self.blacklist_button.Bind(wx.EVT_BUTTON, self.on_blacklist)
-        
-        self.sub_sizer_right.Add(self.statustext, 0,  wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_right.Add(self.logintext, 0,  wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_left.Add(self.start_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_left.Add(self.stop_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_left.Add(self.secondary_frame_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_right.Add(self.login_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_right.Add(self.quit_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_stats.Add(self.stattext, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.sub_sizer_filter.Add(self.blacklist_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.SetSizer(self.main_sizer)
-        self.start_button.Enable(enable=settings["loggedin"])
-        self.stop_button.Enable(enable=settings["loggedin"])
-        self.secondary_frame_button.Enable(enable=settings["loggedin"])
-        
         wx.CallAfter(self.updatedata)
         
         wx.GetApp().ProcessPendingEvents() 
+        self.main_sizer.Add(self.list_ctrl, 0, wx.ALL | wx.EXPAND, 20)
+        start_button = wx.Button(self, label='Start IPPigeon')
+        start_button.SetBackgroundColour((205, 215, 206))
+        start_button.Bind(wx.EVT_BUTTON, self.on_start)
+        #start_button.Bind(wx.EVT_ENTER_WINDOW, self.on_start)
+        stop_button = wx.Button(self, label='Stop IPPigeon')
+        stop_button.SetBackgroundColour('#F08080')
+
+        secondary_frame_button = wx.Button(self, label='Settings')
+        secondary_frame_button.Bind(wx.EVT_BUTTON, self.on_window)
+        # wx.BORDER(stop_button, wx.BORDER_NONE)
+        stop_button.Bind(wx.EVT_BUTTON, self.on_stop)
+        self.main_sizer.Add(self.statustext, 0,  wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(start_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(stop_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(secondary_frame_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.SetSizer(self.main_sizer)
 
     def handle_columns(self):
         for col in range(len(COLUMN_NAMES)):
             self.list_ctrl.InsertColumn(0, COLUMN_NAMES[col], width=COLUMN_SIZES[col])
 
-    def checklogin(self):
-        self.start_button.Enable(enable=settings["loggedin"])
-        self.stop_button.Enable(enable=settings["loggedin"])
-        self.secondary_frame_button.Enable(enable=settings["loggedin"])
-        self.quit_button.Enable(enable=settings["loggedin"])
-        if self.list_ctrl.GetFirstSelected() < 0:
-            self.blacklist_button.Enable(enable=False)
-        else:
-            self.blacklist_button.Enable(enable=settings["loggedin"])
     def updatedata(self):
         global settings
         if settings["running"] == True:
             txt = "Status: Running (" + str(settings["config"]["core"]["level"]) + ")"
         else:
             txt = "Status: Not running"
-        #self.list_ctrl.SetSize(self.GetSize()[0] - 50, self.GetSize()[1] - 200)
-        self.checklogin()
-        if settings["loggedin"] == True:
-            logintxt = "   Logged in"
-            self.login_button.SetLabelText("Logout")
-        else:
-            self.login_button.SetLabelText("Login")
-            logintxt = "Not logged in"
         
-        stattxt = "Statistics:\nBlocked Connections: " + str(settings["stats"][0]) + " \nAllowed Connections: " + str(settings["stats"][1]) + " \nUpload count: " + str(settings["stats"][2]) + " \nDownload count: " + str(settings["stats"][3]) + " \nBlock ratio: " + str("{:.4f}".format(settings["stats"][4]))
         
-        self.statustext.SetLabel(txt)
-        self.logintext.SetLabel(logintxt)
-        self.stattext.SetLabel(stattxt)
         if settings["newdata"] == True:
             settings["newdata"] = False
         else:
-            wx.CallLater(100, self.updatedata)
+            wx.CallLater(1000, self.updatedata)
             return
         fprint("updatedata called")
         loaddata()
-        list_total  = self.list_ctrl.GetItemCount()
-        list_top    = self.list_ctrl.GetTopItem()
-        list_pp     = self.list_ctrl.GetCountPerPage()
-        list_bottom = min(list_top + list_pp, list_total - 1)
         if self.list_ctrl.DeleteAllItems():
             fprint("Items deleted")
         else:
@@ -279,11 +213,10 @@ class ServerPanel(wx.Panel):
             if str(TEST_FILE.iloc[i, 4]).find("TIME_WAIT") >= 0 or str(TEST_FILE.iloc[i, 4]).find("FIN_WAIT_2") >= 0:
                 continue
             idx = 0
-            for app in settings["badapps"]:
+            for ip in settings["badips"]:
                 #fprint(pid)
                 idx = i
-                if TEST_FILE.iloc[i, 5] == app: # "bad" pid, highlight in red at the top
-                    fprint("BAD APP UI: " + str(app))
+                if str(TEST_FILE.iloc[i, 3]).find(ip) >= 0 and str(TEST_FILE.iloc[i, 4]).find("TIME_WAIT") < 0: # "bad" pid, highlight in red at the top
                     idx = self.list_ctrl.InsertItem(0, TEST_FILE.iloc[i, 0])
                     self.list_ctrl.SetItemBackgroundColour(idx, wx.Colour(200, 51, 51))
                     break
@@ -297,16 +230,15 @@ class ServerPanel(wx.Panel):
                 #fprint(str(idx) + " " + str(TEST_FILE.iloc[i, 0]))
                 self.list_ctrl.SetItem(idx, j, str(TEST_FILE.iloc[i, j]))
 
-
                 #fprint(i, j, TEST_FILE.iloc[i, j])
         #self.SetSizer(self.main_sizer)
-        
-        self.list_ctrl.EnsureVisible((list_bottom - 1))
-        wx.CallLater(100, self.updatedata)
+        self.statustext.SetLabel(txt)
+        wx.CallLater(1000, self.updatedata)
 
     def on_start(self, event):
         fprint('in on_start')
         settings["running"] = True
+        # fprint("check if settings[running] is set to true" + str(settings["running"]))
 
     def on_stop(self, event):
         fprint('in on_stop')
@@ -318,33 +250,6 @@ class ServerPanel(wx.Panel):
         dg = GetData(parent = None)
         dg.ShowModal()
 
-    def on_login(self, event):
-        fprint("open login")
-        if settings["loggedin"] == True:
-            settings["loggedin"] = False
-            return
-        dg2 = ServerFrame()
-        
-        #dg2.ShowModal()
-    def on_quit(self, event):
-        global killme
-        killme.value += 1
-        self.Close()
-        self.Parent.Close()
-
-    def on_blacklist(self, event): 
-        global settings
-        tmp = settings["appendbad"]
-        idx = self.list_ctrl.GetFirstSelected()
-        if idx < 0:
-            return
-        proto = self.list_ctrl.GetItem(idx, 1).GetText()
-        dest = self.list_ctrl.GetItem(idx, 3).GetText()
-        destip, destport = dest.split(":")
-        fprint([proto, destip, destport])
-        tmp.append(["N/A", proto, "N/A", "N/A", destip, destport, "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
-        settings["appendbad"] = tmp
-        
     def ShowImage(self, imageFile):
         if imageFile == "":
             self.bitmap = wx.StaticBitmap(self, -1, size=(0, 0))
@@ -372,20 +277,20 @@ def openwindow(data, sets, kill):
     killme = kill
     displaydata = data
     settings = sets
-    #if settings["loggedin"]:
+    if settings["loggedin"] == False:
         fprint("Creating server panel")
         loaddata()
         app = wx.App(False)
         frame = OtherFrame()
         frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
         app.MainLoop()
-    #else:
-    #fprint("Creating login panel")
+    else:
+        fprint("Creating login panel")
         
-    #app = wx.App(False)
-    #frame = ServerFrame()
-    #frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
-    #app.MainLoop()
+        app = wx.App(False)
+        frame = ServerFrame()
+        frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
+        app.MainLoop()
 
 class GetData(wx.Dialog):
     def __init__(self, parent):

ssh.py

@@ -3,20 +3,13 @@ from fabric import Connection
 from util import find_data_file
 from util import setup_child
 from util import fprint
-from util import macos
 from invoke import exceptions
 import sys
 
-c = None
-
 def sftp_send_data(config, filename, filetype):
     setup_child()
-    if not macos:
     fprint("Connecting over SSH to " + config['sftp']['host'])
-        global c
-        if c is None:
     c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
-
     fprint("Sending data over SFTP: " + filename)
     fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
     fprint("Data sent over SFTP successfully")
@@ -26,8 +19,6 @@ def sftp_send_data(config, filename, filetype):
 def check_for_file(config, filename, location):
     setup_child()
     fprint("Connecting over SSH to " + config['sftp']['host'])
-    global c
-    if c is None:
     c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
     fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename)
     try:
@@ -40,8 +31,6 @@ def check_for_file(config, filename, location):
 def run_ssh(config, command, location):
     setup_child()
     fprint("Connecting over SSH to " + config['sftp']['host'])
-    global c
-    if c is None:
     c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
     fprint("cd to " + config['sftp']['filepath'][location])
     with c.cd(config['sftp']['filepath'][location]):

util.py

@@ -6,7 +6,6 @@ from sys import platform
 import time as t
 from time import sleep
 import uuid
-import csv
 
 win32 = platform == "win32"
 linux = platform == "linux" or platform == "linux2"
@@ -123,35 +122,3 @@ class Logger(object):
 def clear_fwll():
     if win32:
         run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')
-    if linux:
-        run_cmd("nft delete table ip ippigeon")
-
-
-def write_stats(stats):
-    fprint("Writing stats")
-    tmp = list()
-    tmp.append(["connections blocked", "connections allowed", "data uploaded", "data recieved", "block ratio"])
-    tmp.append(stats)
-    
-    with open(find_data_file("stats.csv"), "w", newline="") as f:
-        writer = csv.writer(f)
-        writer.writerows(tmp)
-    fprint("Done writing stats")
-
-def read_stats():
-    with open(find_data_file("stats.csv"), newline='') as csvfile:
-        csvreader = csv.reader(csvfile, delimiter=',', quotechar='|')
-        header = True
-        fprint(csvreader)
-        data = list()
-        for line in csvreader:
-            fprint(line)
-            if header:
-                header = False
-                continue
-            data = line
-        for idx in range(len(data) - 1):
-            data[idx] = int(data[idx])
-        data[len(data) - 1] = float(data[len(data) - 1])
-        return data
-            

wizard.py

@@ -0,0 +1,34 @@
+import wx
+from wx.adv import Wizard, WizardPageSimple
+
+class TitlePage(WizardPageSimple):
+
+    def __init__(self, parent, title):
+        WizardPageSimple.__init__(self, parent)
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        self.SetSizer(sizer)
+
+        title = wx.StaticText(self, wx.ID_ANY, title)
+        title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
+        sizer.Add(title, 0, wx.ALIGN_CENTER|wx.ALL, 5)
+        sizer.Add(wx.StaticLine(self, wx.ID_ANY), 0, wx.EXPAND|wx.ALL, 5)
+
+
+def main():
+    wizard = Wizard(None, wx.ID_ANY, "Simple Wizard")
+    page1 = TitlePage(wizard, "Page 1")
+    page2 = TitlePage(wizard, "Page 2")
+    page3 = TitlePage(wizard, "Page 3")
+
+    WizardPageSimple.Chain(page1, page2)
+    WizardPageSimple.Chain(page2, page3)
+    wizard.FitToPage(page1)
+
+    wizard.RunWizard(page1)
+    wizard.Destroy()
+
+if __name__ == "__main__":
+    app = wx.App()
+    main()
+    app.MainLoop()

wizardTutorial.py

@@ -0,0 +1,111 @@
+import wx
+########################################################################
+class WizardPage(wx.Panel):
+    """"""
+    #----------------------------------------------------------------------
+    def __init__(self, parent, title=None):
+        """Constructor"""
+        wx.Panel.__init__(self, parent)
+        
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        self.SetSizer(sizer)
+        
+        if title:
+            title = wx.StaticText(self, -1, title)
+            title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
+            sizer.Add(title, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
+            sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND|wx.ALL, 5)
+    
+    
+########################################################################
+class WizardPanel(wx.Panel):
+    """"""
+    #----------------------------------------------------------------------
+    def __init__(self, parent):
+        """Constructor"""
+        wx.Panel.__init__(self, parent=parent)
+        self.pages = []
+        self.page_num = 0
+        
+        self.mainSizer = wx.BoxSizer(wx.VERTICAL)
+        self.panelSizer = wx.BoxSizer(wx.VERTICAL)
+        btnSizer = wx.BoxSizer(wx.HORIZONTAL)
+                
+        # add prev/next buttons
+        self.prevBtn = wx.Button(self, label="Previous")
+        self.prevBtn.Bind(wx.EVT_BUTTON, self.onPrev)
+        btnSizer.Add(self.prevBtn, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+        
+        self.nextBtn = wx.Button(self, label="Next")
+        self.nextBtn.Bind(wx.EVT_BUTTON, self.onNext)
+        btnSizer.Add(self.nextBtn, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
+        
+        # finish layout
+        self.mainSizer.Add(self.panelSizer, 1, wx.EXPAND)
+        self.mainSizer.Add(btnSizer, 0, wx.ALIGN_RIGHT)
+        self.SetSizer(self.mainSizer)
+        
+        
+    #----------------------------------------------------------------------
+    def addPage(self, title=None):
+        """"""
+        panel = WizardPage(self, title)
+        self.panelSizer.Add(panel, 2, wx.EXPAND)
+        self.pages.append(panel)
+        if len(self.pages) > 1:
+            # hide all panels after the first one
+            panel.Hide()
+            self.Layout()
+            
+    #----------------------------------------------------------------------
+    def onNext(self, event):
+        """"""
+        pageCount = len(self.pages)
+        if pageCount-1 != self.page_num:
+            self.pages[self.page_num].Hide()
+            self.page_num += 1
+            self.pages[self.page_num].Show()
+            self.panelSizer.Layout()
+        else:
+            print("End of pages!")
+            
+        if self.nextBtn.GetLabel() == "Finish":
+            # close the app
+            self.GetParent().Close()
+            
+        if pageCount == self.page_num+1:
+            # change label
+            self.nextBtn.SetLabel("Finish")
+    
+    #----------------------------------------------------------------------
+    def onPrev(self, event):
+        """"""
+        pageCount = len(self.pages)
+        if self.page_num-1 != -1:
+            self.pages[self.page_num].Hide()
+            self.page_num -= 1
+            self.pages[self.page_num].Show()
+            self.panelSizer.Layout()
+        else:
+            print("You're already on the first page!")
+        
+    
+########################################################################
+class MainFrame(wx.Frame):
+    """"""
+    #----------------------------------------------------------------------
+    def __init__(self):
+        """Constructor"""
+        wx.Frame.__init__(self, None, title="Generic Wizard", size=(800,600))
+        
+        self.panel = WizardPanel(self)
+        self.panel.addPage("Page 1")
+        self.panel.addPage("Page 2")
+        self.panel.addPage("Page 3")
+        
+        self.Show()
+    
+if __name__ == "__main__":
+    app = wx.App()
+    frame = MainFrame()
+    app.MainLoop()