add macos initial support, ui changes

.vscode/settings.json

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

config.yml

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

ippigeon.py

@@ -60,8 +60,8 @@ if linux or macos:
 
 def netstat_done(res):
     fprint("netstat done, processing")
-    #procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done)
+    procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done)
-    netstat.process(res)
+    #netstat.process(res)
 
 def process_done(res):
     if settings["running"] == True:
@@ -138,6 +138,7 @@ 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
@@ -153,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
@@ -205,8 +206,12 @@ def mainloop(pool):
             badip = line[4]
             badport = line[5]
             fprint("Firewalling " + badip + ":" + 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)
+            if win32:
-            run_cmd(cmd)
+                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:
@@ -284,6 +289,11 @@ 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!

netstat.py

@@ -71,7 +71,45 @@ def process(data):
             writer.writerows(output2)
         fprint("done creating csv")
     
-    if linux or macos:
+    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:
         output = data.stdout.decode().split('\n') # split stdout into lines
         #output = data.stdout.decode().split(',')
         #fprint("output data: " + str(output))
@@ -84,7 +122,7 @@ def process(data):
         for line in output:
             string_split = line.split(" ")
             string_split = [i for i in string_split if i]
-            fprint("Input: " + str(string_split))
+            #fprint("Input: " + str(string_split))
 
             if string_split[1].find("Multipath") >= 0:
                 break
@@ -92,16 +130,16 @@ def process(data):
                 continue
             
             if len(string_split) == 10: # no connection status
-                fprint(string_split)
+                #fprint(string_split)
                 string_split.append(string_split[-1])
                 string_split[-7] = "UNKNOWN"
                 string_split[-4] = string_split[-5]
-                fprint(string_split)
+                #fprint(string_split)
             
            
             
-            output2.append(["", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]]) 
+            output2.append(["Unknown", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]]) 
-        fprint("FINAL CSV: " + str(output2))
+        #fprint("FINAL CSV: " + str(output2))
         
         with open(find_data_file(util.datafile), "w", newline="") as f:
             writer = csv.writer(f)
@@ -109,6 +147,7 @@ def process(data):
         fprint("done creating csv")
 
         
+
 def start():
     setup_child()
     fprint("netstat started")
@@ -127,3 +166,4 @@ 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, 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))
 
@@ -101,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):
@@ -142,7 +145,9 @@ 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.row_obj_dict = {}
         self.list_ctrl = wx.ListCtrl(
             self, size=(-1, 400),
@@ -159,37 +164,60 @@ 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.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:
@@ -197,11 +225,20 @@ 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"
+        self.statustext.SetLabel(txt)
+        self.logintext.SetLabel(logintxt)
         if settings["newdata"] == True:
             settings["newdata"] = False
         else:
-            wx.CallLater(1000, self.updatedata)
+            wx.CallLater(100, self.updatedata)
             return
         fprint("updatedata called")
         loaddata()
@@ -232,8 +269,8 @@ 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')
@@ -249,6 +286,15 @@ 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))
@@ -276,20 +322,20 @@ def openwindow(data, sets, kill):
     killme = kill
     displaydata = data
     settings = sets
-    if settings["loggedin"]:
+    #if settings["loggedin"]:
-        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,3 +122,5 @@ 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

@@ -1,34 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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()