update block ratio format

block.py

@@ -52,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)
@@ -67,13 +67,15 @@ def block_conn(config, datafile, res):
             pid = int(pid)
         except ValueError:
             continue
-
+        found = False
         for line in baddata:
             #fprint(destip + " " + line[4])
             badsrcip = line[2]
             baddestip = line[4]
             badpid = line[11]
+            
             if srcip == badsrcip or destip == baddestip and not pid in badapps:
+                found = True
                 fprint("FLAG " + srcip + " " + destip + " " + str(pid))
                 badapps.append(pid)
                 badips.append(baddestip)
@@ -81,4 +83,8 @@ def block_conn(config, datafile, res):
                 #fprint(badapps)
                 #fprint("FLAG " + srcip + " " + destip + " " + str(pid))
                 #kill(pid)
-    return badapps, badips, badlines
+            
+        if not found:
+            goodct = goodct + 1
+    
+    return badapps, badips, badlines, goodct

config.yml

@@ -1,7 +1,7 @@
 core:
-  autostart: false
+  autostart: true
   clockspeed: 20
-  interval: 10
+  interval: 5
   level: 3
   localadmin: true
 sftp:

ippigeon.py

@@ -48,7 +48,7 @@ if win32:
     _, username = res.strip().rsplit("\n", 1)
     userid, sysdom = username.rsplit("\\", 1)
 
-if linux:
+if linux or macos:
     sysid = hex(uuid.getnode())
     #fprint(sysid)
     datafile += sysid
@@ -59,69 +59,87 @@ if linux:
     #fprint(hostname)
 
 def netstat_done(res):
-    fprint("netstat done, processing", settings)
+    fprint("netstat done, processing")
     procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done)
     #netstat.process(res)
 
 def process_done(res):
     if settings["running"] == True:
-        fprint("uploading to sftp...", settings)
+        fprint("uploading to sftp...")
         #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:
-        fprint("Login failure", settings)
+        fprint("Login failure")
         settings["message"] = "Login failure"
     else:
-        fprint("Login result in main: " + str(res), settings)
+        fprint("Login result in main: " + str(res))
         settings["loggedin"] = res
         settings["continueui"] = True
 
 def blockdata_done(res):
     global settings
-    fprint("FINISHED downloading block data", settings)
+    fprint("FINISHED downloading block data")
     tmpkill = settings["kill"]
     settings["kill"] = False
     #block_res = pool.apply_async(block.block_conn, (config, datafile, res, settings))
-    block_pids, block_ips, block_data = block.block_conn(config, datafile, res)
+    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
+
     tmplist = settings["badapps"]
     
     for x in block_pids:
-        fprint(x, settings)
+        fprint(x)
         if not x in tmplist:
             tmplist.append(x)
     settings["badapps"] = tmplist
-    fprint(settings["badapps"], settings)
+    fprint(settings["badapps"])
     
     tmplist = settings["badips"]
     for x in block_ips:
-        fprint(x, settings)
+        fprint(x)
         if not x in tmplist:
             tmplist.append(x)
     settings["badips"] = tmplist
-    fprint(settings["badips"], settings)
+    fprint(settings["badips"])
 
     settings["kill"] = tmpkill
 
     tmplist = settings["badlines"]
     for x in block_data:
-        fprint(x, settings)
+        fprint(x)
         if not x in tmplist:
             tmplist.append(x)
     settings["badlines"] = tmplist
-    fprint(settings["badlines"], settings)
+    fprint(settings["badlines"])
 
     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:
         kid.kill()
-    fprint("Every child has been killed", settings)
+    fprint("Every child has been killed")
     os.kill(os.getpid(), 9) # dirty kill of self
 
 
@@ -138,14 +156,17 @@ 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))
-            fprint("netstat starting", settings)
+            fprint("netstat starting")
             netdata_res = pool.apply_async(netstat.start, callback=netstat_done)
             #fprint(netdata_res.successful())
     
@@ -153,11 +174,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
@@ -199,14 +220,21 @@ 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), settings)
+            fprint("Firewalling " + badip + ":" + str(badport))
+            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)
         
     
     if settings["applyconfig"] == True:
@@ -216,8 +244,7 @@ def mainloop(pool):
         with open(find_data_file('config.yml'), 'w') as filewrite:
             #global config
             yaml.dump(config, filewrite)
-        fprint("Config saved!", settings)
-    
+        fprint("Config saved!")
 
     sleep(interval / (interval * config["core"]["clockspeed"]))
     counter += 1
@@ -259,6 +286,7 @@ 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
@@ -274,20 +302,29 @@ if __name__ == '__main__':
             settings["fwll"] = 0
             settings["running"] = config["core"]["autostart"]
             settings["newdata"] = False
-            settings["logMsg"] = list()
+            # 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

@@ -4,7 +4,7 @@ from util import fprint
 from util import run_cmd
 from util import win32
 from util import linux
-from ippigeon import settings
+from util import macos
 import util
 import time
 import csv
@@ -13,12 +13,12 @@ import csv
 
 def process(data):
     setup_child()
-    fprint("netstat processing", settings)
+    fprint("netstat processing")
     if win32:
         #output = data.stdout
         #print(output)
         output = data.stdout.decode().split('\r\n') # split stdout into lines
-        print("data", data)
+        #print(output)
         if output[0].find("The requested operation requires elevation.") >= 0:
             #print("test3")
             raise PermissionError("Unable to acquire netstat data without admin!")
@@ -69,13 +69,13 @@ def process(data):
         with open(find_data_file(util.datafile), "w", newline="") as f:
             writer = csv.writer(f)
             writer.writerows(output2)
-        fprint("done creating csv", settings)
+        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", settings)
+            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
@@ -107,20 +107,62 @@ def process(data):
         with open(find_data_file(util.datafile), "w", newline="") as f:
             writer = csv.writer(f)
             writer.writerows(output2)
-        fprint("done creating csv", settings)
+        fprint("done creating csv")
+
+    if macos:
+        output = data.stdout.decode().split('\n') # split stdout into lines
+        #output = data.stdout.decode().split(',')
+        #fprint("output data: " + str(output))
+        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[1].find("Multipath") >= 0:
+                break
+            if string_split[0].find("Active") >= 0 or string_split[0].find("Proto") >= 0:
+                continue
+            
+            if len(string_split) == 10: # no connection status
+                #fprint(string_split)
+                string_split.append(string_split[-1])
+                string_split[-7] = "UNKNOWN"
+                string_split[-4] = string_split[-5]
+                #fprint(string_split)
+            
+           
+            
+            output2.append(["Unknown", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]]) 
+        #fprint("FINAL CSV: " + str(output2))
+        
+        with open(find_data_file(util.datafile), "w", newline="") as f:
+            writer = csv.writer(f)
+            writer.writerows(output2)
+        fprint("done creating csv")
 
 
 def start():
     setup_child()
-    fprint("netstat started", settings)
+    fprint("netstat started")
     
     if win32:
         data = run_cmd("netstat -n -o -b")
-        fprint("data acquired", settings)
+        fprint("data acquired")
         return data
 
     if linux:
         data = run_cmd("netstat -atunpw")
-        fprint("data acquired", settings)
+        fprint("data acquired")
+        return data
+
+    if macos:
+        data = run_cmd("netstat -anv")
+        fprint("data acquired")
         return data
 

panel.py

@@ -1,6 +1,4 @@
 import glob
-import logging
-import sys
 import wx
 import wx.lib.buttons as buttons
 import numpy as np
@@ -42,14 +40,14 @@ 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, 620))
+        wx.Frame.__init__(self, None, -1, 'Server Panel', size=(1000, 675))
         panel = ServerPanel(self)
         self.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
 
         self.Show()
 
     def on_edit(self, event):
-        fprint('in on_edit', settings)
+        fprint('in on_edit')
 
     def on_window(self, event):
        return
@@ -103,6 +101,9 @@ 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):
@@ -144,7 +145,10 @@ class ServerPanel(wx.Panel):
         super().__init__(parent, size=(500, 500))
         #self.SetBackgroundColour((44, 51, 51))
         self.main_sizer = wx.BoxSizer(wx.VERTICAL)
-        secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        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.row_obj_dict = {}
         self.list_ctrl = wx.ListCtrl(
             self, size=(-1, 400),
@@ -161,47 +165,65 @@ 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_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.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_stats.Add(self.stattext, 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)
-
-        log_button = wx.Button(self, label='Logs')
-        log_button.Bind(wx.EVT_BUTTON, self.on_log)
-
-        #self.log_window = wx.LogWindow(self, 'Log Window', True)
-    
-        #show_log_button = wx.Button(self, wx.NewId(), 'Show Log')
-        #show_log_button.Bind(wx.EVT_BUTTON, self._show_log)    
-        # 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"])
     def updatedata(self):
         global settings
         if settings["running"] == True:
@@ -209,19 +231,31 @@ class ServerPanel(wx.Panel):
         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(1000, self.updatedata)
+            wx.CallLater(100, self.updatedata)
             return
-        fprint("updatedata called", settings)
+        fprint("updatedata called")
         loaddata()
-        #logData.doLogging(logData)
         if self.list_ctrl.DeleteAllItems():
-            fprint("Items deleted", settings)
+            fprint("Items deleted")
         else:
-            fprint("Unable to delete", settings)
+            fprint("Unable to delete")
         for i in range(len(TEST_FILE)):
             if str(TEST_FILE.iloc[i, 4]).find("TIME_WAIT") >= 0 or str(TEST_FILE.iloc[i, 4]).find("FIN_WAIT_2") >= 0:
                 continue
@@ -245,32 +279,31 @@ class ServerPanel(wx.Panel):
 
                 #fprint(i, j, TEST_FILE.iloc[i, j])
         #self.SetSizer(self.main_sizer)
-        self.statustext.SetLabel(txt)
-        wx.CallLater(1000, self.updatedata)
+        
+        wx.CallLater(100, self.updatedata)
 
     def on_start(self, event):
-        fprint('in on_start', settings)
+        fprint('in on_start')
         settings["running"] = True
 
     def on_stop(self, event):
-        fprint('in on_stop', settings)
+        fprint('in on_stop')
         settings["running"] = False
         util.clear_fwll()
 
     def on_window(self, event):
-        fprint("open settings", settings)
+        fprint("open settings")
         dg = GetData(parent = None)
         dg.ShowModal()
 
-    def on_log(self, event):
-        fprint("open log", settings)
-        dg = logData(parent = None)
-        #fprint("attempting logLoop", settings)
-        logData.logLoop(dg)
-        #fprint("did logLoop work?", settings)
-        dg.ShowModal()
-        
+    def on_login(self, event):
+        fprint("open login")
+        if settings["loggedin"] == True:
+            settings["loggedin"] = False
+            return
+        dg2 = ServerFrame()
         
+        #dg2.ShowModal()
 
     def ShowImage(self, imageFile):
         if imageFile == "":
@@ -299,65 +332,20 @@ def openwindow(data, sets, kill):
     killme = kill
     displaydata = data
     settings = sets
-    if settings["loggedin"]:
-        fprint("Creating server panel", settings)
+    #if settings["loggedin"]:
+    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", settings)
-        
-        app = wx.App(False)
-        frame = ServerFrame()
-        frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
-        app.MainLoop()
-class RedirectText(object):
-    def __init__(self,aWxTextCtrl):
-        self.out = aWxTextCtrl
-
-    def write(self,string):
-        self.out.WriteText(string)
-
-class logData(wx.Dialog):
-    def __init__(self, parent):
-        wx.Dialog.__init__(self, parent, wx.ID_ANY, "Logs: ", size = (800,500))
-        self.p = wx.Panel(self, wx.ID_ANY)
-        #self.logBox = wx.BoxSizer(wx.VERTICAL)
-        self.logsTitle  = wx.StaticText(self.p, label="Logs", pos=(20,20))
-        self.logs = wx.TextCtrl(self.p, pos=(20,40), size= (700, 400), style=wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
-        self.logs.WriteText("init\n")
-        #keepLoop = False
-
-    def logLoop(self):
-        self.logs.WriteText("before while loop\n")
-        i=0
-        if (settings["logMsg"] is not None):
-            while(i < len(settings["logMsg"])):
-                #for i in range(len(settings["logMsg"])):
-                #self.logs.WriteText("in while loop\n")
-                self.logs.WriteText(settings["logMsg"][i])
-                self.logs.WriteText("\n")
-                i+=1
-        else:
-            self.logs.WriteText("settings is none :(")
-            settings["logMsg"].add("init string for list")
-            logData.logLoop(self)
-        self.logs.WriteText("after while loop\n")
-        
-
-
-        #redir = RedirectText(self.logs)
-        #sys.stdout = redir
-        #self.logs.WriteText(redir)
-
-        #self.logs.LoadFile('output.log')
-    
-    #def doLogging(self):
-        #self.logs.WriteText("hi from doLogging\n")
-        #self.logs.WriteText(settings["logMsg"])
+    #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()
 
 class GetData(wx.Dialog):
     def __init__(self, parent):
@@ -406,7 +394,7 @@ class GetData(wx.Dialog):
 
     def OnQuit(self, event):
         # save changes
-        fprint("saving changes...", settings)
+        fprint("saving changes...")
         config = settings["config"]
         config["sftp"]["host"] = self.hostnametext.GetValue()
         config["sftp"]["user"] = self.usertext.GetValue()

ssh.py

@@ -5,25 +5,25 @@ from util import setup_child
 from util import fprint
 from invoke import exceptions
 import sys
-settings = None
+
 def sftp_send_data(config, filename, filetype):
     setup_child()
-    fprint("Connecting over SSH to " + config['sftp']['host'], settings)
+    fprint("Connecting over SSH to " + config['sftp']['host'])
     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, settings)
-    fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]), settings)
-    fprint("Data sent over SFTP successfully", settings)
+    fprint("Sending data over SFTP: " + filename)
+    fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
+    fprint("Data sent over SFTP successfully")
     #command = 'ls ' + config['sftp']['filepath'][filetype]
     #fprint(c.run(command))
 
 def check_for_file(config, filename, location):
     setup_child()
-    fprint("Connecting over SSH to " + config['sftp']['host'], settings)
+    fprint("Connecting over SSH to " + config['sftp']['host'])
     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, settings)
+    fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename)
     try:
         res = c.run("ls -l " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
-        fprint("File " + filename + " exists!", settings)
+        fprint("File " + filename + " exists!")
         return c.run("cat " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
     except exceptions.UnexpectedExit:
         return False
@@ -32,9 +32,9 @@ def run_ssh(config, command, location):
     setup_child()
     fprint("Connecting over SSH to " + config['sftp']['host'])
     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], settings)
+    fprint("cd to " + config['sftp']['filepath'][location])
     with c.cd(config['sftp']['filepath'][location]):
-        fprint("Running ssh command: " + command, settings)
+        fprint("Running ssh command: " + command)
         res = c.run(command, hide=True, asynchronous=True)
         return res
 

taskbartool.py

@@ -42,7 +42,7 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
         self.SetIcon(icon, TRAY_TOOLTIP)
 
     def on_left_down(self, event):      
-        fprint ('Tray icon was left-clicked.', settings)
+        fprint ('Tray icon was left-clicked.')
 
     def on_open(self, event):
         settings["showui"] = True
@@ -81,7 +81,7 @@ def background(data, sets, kill):
     app = TaskbarApp(False)
     displaydata = data
     settings = sets
-    fprint("Creating taskbar icon", settings)
+    fprint("Creating taskbar icon")
     app.MainLoop()
         
 TRAY_ICON = find_data_file('icon.png')

util.py

@@ -6,14 +6,13 @@ from sys import platform
 import time as t
 from time import sleep
 import uuid
+import csv
 
-logMsg = ""
-logCont = ""
 win32 = platform == "win32"
 linux = platform == "linux" or platform == "linux2"
 macos = platform == "darwin"
 datafile = ""
-settings=None
+
 if win32:
     sysid = hex(uuid.getnode())
     datafile += sysid
@@ -28,7 +27,7 @@ if win32:
     _, username = res.strip().rsplit("\n", 1)
     userid, sysdom = username.rsplit("\\", 1)
 
-if linux:
+if linux or macos:
     sysid = hex(uuid.getnode())
     #fprint(sysid)
     datafile += sysid
@@ -45,28 +44,21 @@ def time():
 def kill(pid):
     setup_child()
     if pid > 0:
-        fprint("Killing PID " + str(pid), settings)
+        fprint("Killing PID " + str(pid))
         os.kill(int(pid), 9)
-        fprint("Signal 9 sent to PID " + str(pid), settings)
+        fprint("Signal 9 sent to PID " + str(pid))
 
-def fprint(msg, settings = None):
+def fprint(msg):
     #if not getattr(sys, "frozen", False):
-    setup_child(settings)
+    setup_child()
     try:
         frm = inspect.stack()[1]
         
         mod = inspect.getmodule(frm[0])
-        logMsg = '[' + mod.__name__ + ":" + frm.function + ']:' + str(msg)
-        
-        print(logMsg)
-        if (settings is not None):
-            tmpList = settings["logMsg"]
-            tmpList.append(logMsg)
-            settings["logMsg"] = tmpList
+        print('[' + mod.__name__ + ":" + frm.function + ']:', str(msg))
     except Exception as e:
         try:
             print('[????:' + frm.function + ']:', str(msg))
-            print(e)
         except:
             print('[????]:', str(msg))
         
@@ -95,38 +87,28 @@ def run_cmd(cmd):
         #else:
         #    print("alt")
         startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW    # , "-WindowStyle", "hidden"
-        fprint("running PS command: " + cmd, settings)
+        fprint("running PS command: " + cmd)
         completed = subprocess.run(["powershell", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
-        fprint("ran PS command successfully", settings)
+        fprint("ran PS command successfully")
         #completed = subprocess.run(["powershell", "-WindowStyle", "hidden", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
         return completed
-    if linux:
-        fprint("running sh command: " + cmd, settings)
+    if linux or macos:
+        fprint("running sh command: " + cmd)
         completed = subprocess.run(["sh", "-c", cmd], capture_output=True)
-        fprint("ran sh command successfully", settings)
+        fprint("ran sh command successfully")
         return completed
 
-def setup_child(sets=None):
+def setup_child():
     if not getattr(sys, "frozen", False):
         sys.stdout = Logger(filename=find_data_file("output.log"))
         sys.stderr = Logger(filename=find_data_file("output.log"))
-    if sets is not None:
-        settings = sets
-        
-
-
-
 
 class Logger(object):
     def __init__(self, filename="output.log"):
-        self.string = ""
         self.log = open(filename, "a")
         self.terminal = sys.stdout
 
     def write(self, message):
-        self.string += message
-        self.string += "\n"
-
         self.log.write(message)
         #close(filename)
         #self.log = open(filename, "a")
@@ -141,3 +123,35 @@ 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
+