currently fixed

.vscode/settings.json

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

config.yml

@@ -1,8 +1,8 @@
 core:
   autostart: true
   clockspeed: 20
-  interval: 5
+  interval: 10
-  level: 2
+  level: 0
   localadmin: true
 sftp:
   filepath:

ippigeon.py

@@ -65,6 +65,7 @@ def netstat_done(res):
 
 def process_done(res):
     if settings["running"] == True:
+        #settings["newdata"] = True
         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)
@@ -138,7 +139,6 @@ 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
@@ -154,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.terminate()
-        #    ppanel = Process(target=panel.openwindow, args=(displaydata,settings,killme))
+            ppanel = Process(target=panel.openwindow, args=(displaydata,settings,killme))
-        #    ppanel.start()  
+            ppanel.start()  
 
     if settings["showui"] == True:
         settings["showui"] = False
@@ -206,12 +206,8 @@ def mainloop(pool):
             badip = line[4]
             badport = line[5]
             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)
-                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)
-                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:
@@ -289,12 +285,7 @@ if __name__ == '__main__':
 
             # initial setup
             #netdata_res = pool.apply_async(netstat, callback=netstat_done)
-            if linux:
+
-                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")
-                
 
             # launch loop - non-blocking!
             counter = 0

netstat.py

@@ -71,45 +71,7 @@ def process(data):
             writer.writerows(output2)
         fprint("done creating csv")
     
-    if linux:
+    if linux or macos:
-        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:
         output = data.stdout.decode().split('\n') # split stdout into lines
         #output = data.stdout.decode().split(',')
         #fprint("output data: " + str(output))
@@ -145,7 +107,6 @@ def process(data):
             writer = csv.writer(f)
             writer.writerows(output2)
         fprint("done creating csv")
-
         
 
 def start():
@@ -166,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,9 +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)
+        secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.sub_sizer_left = wx.BoxSizer(wx.VERTICAL)
-        self.sub_sizer_right = wx.BoxSizer(wx.VERTICAL)
         self.row_obj_dict = {}
         self.list_ctrl = wx.ListCtrl(
             self, size=(-1, 400),
@@ -164,81 +159,49 @@ class ServerPanel(wx.Panel):
         else:
             txt = "Status: Not running"
 
-        if settings["loggedin"] == True:
-            logintxt = "Logged in"
-        else:
-            logintxt = "Not logged in"
         self.statustext = wx.StaticText(self, label=txt) # pos=(20,20))
-        self.logintext = wx.StaticText(self, label=logintxt) # pos=(20,20))
         #self.main_sizer.Add(tb)
         #main_sizer.SetBackgroundColour((44, 51, 51))
         # self.pnl1.SetBackgroundColour(wx.BLACK)
         self.handle_columns()
-        #self.updatedata()
+        # self.updatedata()
-        
-        self.main_sizer.Add(self.list_ctrl, 0, 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.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.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"])
     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"
-        self.statustext.SetLabel(txt)
-        self.logintext.SetLabel(logintxt)
         if settings["newdata"] == True:
             settings["newdata"] = False
         else:
-            wx.CallLater(100, self.updatedata)
+            wx.CallLater(1000, self.updatedata)
             return
         fprint("updatedata called")
         loaddata()
@@ -269,12 +232,13 @@ class ServerPanel(wx.Panel):
 
                 #fprint(i, j, TEST_FILE.iloc[i, j])
         #self.SetSizer(self.main_sizer)
-        
+        self.statustext.SetLabel(txt)
-        wx.CallLater(100, self.updatedata)
+        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')
@@ -286,15 +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 ShowImage(self, imageFile):
         if imageFile == "":
             self.bitmap = wx.StaticBitmap(self, -1, size=(0, 0))
@@ -322,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")
+        fprint("Creating server panel")
-    loaddata()
+        loaddata()
-    app = wx.App(False)
+        app = wx.App(False)
-    frame = OtherFrame()
+        frame = OtherFrame()
-    frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
+        frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
-    app.MainLoop()
+        app.MainLoop()
-    #else:
+    else:
-    #fprint("Creating login panel")
+        fprint("Creating login panel")
-    
+        
-    #app = wx.App(False)
+        app = wx.App(False)
-    #frame = ServerFrame()
+        frame = ServerFrame()
-    #frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
+        frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
-    #app.MainLoop()
+        app.MainLoop()
 
 class GetData(wx.Dialog):
     def __init__(self, parent):

util.py

@@ -122,5 +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")

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()