Clean up extra code

auth.py

@@ -3,14 +3,18 @@ import csv
 from util import fprint
 from util import find_data_file
 from time import sleep
+import bcrypt
 
 def login(config, user, password, sysid):
     fprint("Attempting to login as " + user)
     filename = sysid + "login.csv"
+    
+    #hashpasswd = bcrypt.hashpw(password.encode('utf-8'), user).decode()
     with open(find_data_file(filename), "w", newline="") as f:
         writer = csv.writer(f)
         writer.writerows([[user,password,sysid],])
     fprint("done creating csv")
+    #return True
     ssh.sftp_send_data(config, filename, 'sendlogin')
     command = "python3 login_service.py " + sysid
     ssh.run_ssh(config, command, 'scripts')
@@ -24,6 +28,7 @@ def login(config, user, password, sysid):
                 # try again
                 count += 1
                 sleep(0.1)
+                filename = sysid + "success.txt"
                 #raise ValueError("Unable to determine login status")
             else:
                 return False

block.py

@@ -4,6 +4,7 @@ from util import fprint
 from util import run_cmd
 from util import win32
 from util import linux
+from util import kill
 import util
 import time
 import csv
@@ -12,5 +13,72 @@ import ssh
 def get_blocklist(config):
     setup_child()
     fprint("Downloading deny list from server")
-    data = check_for_file(config, "BadIPs.csv", "receive")
+    data = ssh.check_for_file(config, "BadIPs.csv", "receive")
-    fprint(data.stdout)
+    #fprint(data.stdout)
+    csvreader = csv.reader(data.stdout.split("\n"), delimiter=',', quotechar='|')
+    data2 = list()
+    for row in csvreader:
+        data2.append(row)
+    data2 = [i for i in data2 if i]
+    #fprint(data2)
+    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)
+    with open(find_data_file("blocklist.csv"), "w", newline="") as f:
+        writer = csv.writer(f)
+        writer.writerows(data2)
+    fprint("done creating csv")
+    return data2
+
+def block_conn(config, datafile, res):
+    setup_child()
+    fprint("Searching block data")
+    mydata = list()
+    badapps = list()
+    badips = list()
+    badlines = list()
+    with open(find_data_file(datafile), newline='') as csvfile:
+        csvreader = csv.reader(csvfile, delimiter=',', quotechar='|')
+        
+        for row in csvreader:
+            mydata.append(row)
+    
+    baddata = res
+    fprint("Local loaded successfully")
+    
+    #fprint(mydata)
+    for line in mydata:
+        #fprint(line)
+        #fprint(line)
+        if line[0].find("0x") >= 0:
+            continue
+
+        srcip = line[2].split(":")[0]
+        destip = line[3].split(":")[0]
+        pid = line[5]
+        try: 
+            pid = int(pid)
+        except ValueError:
+            continue
+
+        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:
+                fprint("FLAG " + srcip + " " + destip + " " + str(pid))
+                badapps.append(pid)
+                badips.append(baddestip)
+                badlines.append(line)
+                #fprint(badapps)
+                #fprint("FLAG " + srcip + " " + destip + " " + str(pid))
+                #kill(pid)
+    return badapps, badips, badlines

config.yml

@@ -1,20 +1,19 @@
+core:
+  autostart: false
+  clockspeed: 20
+  interval: 10
+  level: 3
+  localadmin: true
 sftp:
-  host: ec2-34-232-29-46.compute-1.amazonaws.com
-  user: ec2-user
-  port: 22
-  keyfile: keyfile-admin.pem
   filepath:
-    send: /home/ec2-user/Incoming/Incoming_Data
-    sendlogin: /home/ec2-user/Incoming/Login
     receive: /home/ec2-user/Outgoing/Outgoing_Data
     receivelogin: /home/ec2-user/Outgoing/Login
     scripts: /home/ec2-user/scripts
-
+    send: /home/ec2-user/Incoming/Incoming_Data
+    sendlogin: /home/ec2-user/Incoming/Login
+  host: ec2-34-232-29-46.compute-1.amazonaws.com
+  keyfile: keyfile-admin.pem
+  port: 22
+  user: ec2-user
 ui:
   darkmode: true
-
-core:
-  autokill: false
-  localadmin: true
-  interval: 10
-  clockspeed: 20

ippigeon.py

@@ -8,6 +8,8 @@ import uuid
 import yaml
 from util import find_data_file
 from util import fprint
+from util import kill
+from util import run_cmd
 import taskbartool
 import util
 import netstat
@@ -17,6 +19,7 @@ import panel
 import block
 
 badapps = [756, 278670]
+badips = ["208.59.79.12",]
 displaydata = None
 settings = None
 netdata_res = None
@@ -61,9 +64,13 @@ def netstat_done(res):
     #netstat.process(res)
 
 def process_done(res):
+    if settings["running"] == True:
         fprint("uploading to sftp...")
         #ssh.sftp_send_data(res, config, datafile)
-    procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'))
+        procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'), callback=upload_done)
+    
+def upload_done(res):
+    settings["block"] = True
 
 def login_done(res):
     if not res:
@@ -74,6 +81,41 @@ def login_done(res):
         settings["loggedin"] = res
         settings["continueui"] = True
 
+def blockdata_done(res):
+    global 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)
+    tmplist = settings["badapps"]
+    
+    for x in block_pids:
+        fprint(x)
+        if not x in tmplist:
+            tmplist.append(x)
+    settings["badapps"] = tmplist
+    fprint(settings["badapps"])
+    
+    tmplist = settings["badips"]
+    for x in block_ips:
+        fprint(x)
+        if not x in tmplist:
+            tmplist.append(x)
+    settings["badips"] = tmplist
+    fprint(settings["badips"])
+
+    settings["kill"] = tmpkill
+
+    tmplist = settings["badlines"]
+    for x in block_data:
+        fprint(x)
+        if not x in tmplist:
+            tmplist.append(x)
+    settings["badlines"] = tmplist
+    fprint(settings["badlines"])
+
+    settings["newdata"] = True
         
 def killall():
     kids = active_children()
@@ -82,15 +124,11 @@ def killall():
     fprint("Every child has been killed")
     os.kill(os.getpid(), 9) # dirty kill of self
 
-def kill(pid):
+
-    setup_child()
-    fprint("Killing PID " + str(pid))
-    #os.kill(pid, 9)
-    fprint("Signal 9 sent to PID " + str(pid))
 
 def mainloop(pool):
     # worker pool: netstat, netstat cleanup, upload, download, ui tasks
-    
+    global config
     global counter
     global netdata_res
     global procdata_res
@@ -103,7 +141,7 @@ def mainloop(pool):
         killall()
     #print(res.get(timeout=1))
     if counter == 0: # runs every INTERVAL
-        fprint("start loop")
+        #fprint("start loop")
         if netdata_res is None or netdata_res.ready():
             #rawdata = netdata_res.get()
             #procdata_res = pool.apply_async(process_netstat, (rawdata))
@@ -132,15 +170,53 @@ def mainloop(pool):
         settings["login"] = False
         
     
-    if settings["block"] == True:
+    if settings["block"] == True and settings["running"] == True:
-        blockdata_res = pool.apply_async(block.get_blocklist, (config,)) #, callback=blockdata_done)
+        blockdata_res = pool.apply_async(block.get_blocklist, (config,), callback=blockdata_done)
+        #block.get_blocklist(config)
         settings["block"] = False
-    #fprint(settings["killbox"])
+
-    if len(settings["killbox"]) > 0:
+    if config["core"]["level"] == 0:
-        fprint("Kill opportunity!")
+        settings["kill"] = False
-        for proc in settings["killbox"]:
+        settings["fwll"] = False
-            pool.apply_async(kill, (proc,))
+
-            settings["killbox"].remove(proc)
+    if config["core"]["level"] == 1:
+        settings["kill"] = True
+        settings["fwll"] = False
+
+    if config["core"]["level"] == 2:
+        settings["kill"] = False
+        settings["fwll"] = True
+
+    if config["core"]["level"] == 3:
+        settings["kill"] = True
+        settings["fwll"] = True
+
+    if settings["kill"] == True:
+        tmplist = settings["badapps"]
+        settings["badapps"] = list()
+        for x in tmplist:
+            kill(x)
+
+    if settings["fwll"] == True:
+        tmplist = settings["badlines"]
+        settings["badlines"] = list()
+        for line in tmplist:
+            badproto = line[1]
+            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)
+            run_cmd(cmd)
+        
+    
+    if settings["applyconfig"] == True:
+        settings["applyconfig"] = False
+        config = settings["config"]
+        #fprint(settings["config"])
+        with open(find_data_file('config.yml'), 'w') as filewrite:
+            #global config
+            yaml.dump(config, filewrite)
+        fprint("Config saved!")
 
     sleep(interval / (interval * config["core"]["clockspeed"]))
     counter += 1
@@ -172,12 +248,12 @@ if __name__ == '__main__':
     
     sys.stdout = Logger(filename=find_data_file("output.log"))
     sys.stderr = Logger(filename=find_data_file("output.log"))
-    
-    with Pool(processes=5) as pool:
     with Manager() as manager:
-            with open(find_data_file('config.yml'), 'r') as file:
+        with Pool(processes=5) as pool:
+            
+            with open(find_data_file('config.yml'), 'r') as fileread:
                 #global config
-                config = yaml.safe_load(file)
+                config = yaml.safe_load(fileread)
                 #print(config['sftp']['host'])
             interval = config['core']['interval']
             displaydata = manager.list(range(2)) # data to be printed
@@ -187,11 +263,20 @@ if __name__ == '__main__':
             settings["showui"] = False
             settings["continueui"] = False
             settings["killbox"] = list()
-            settings["badapps"] = badapps
+            settings["badapps"] = list()
-            settings["block"] = True
+            settings["badips"] = list()
+            settings["badlines"] = list()
+            settings["block"] = False
+            settings["kill"] = False
+            settings["config"] = config
+            settings["applyconfig"] = False
+            settings["fwll"] = 0
+            settings["running"] = config["core"]["autostart"]
+            settings["newdata"] = False
             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
@@ -205,10 +290,3 @@ if __name__ == '__main__':
             counter = 0
             while(keeprunning):
                 mainloop(pool)
-
-
-
-
-
-
-

panel.py

@@ -7,25 +7,43 @@ from util import sysid
 from util import setup_child
 from util import fprint
 from util import find_data_file
+import util
 
 BG_IMG = 'icon.png'
 filename = sysid + "gendata.csv"
 COLUMN_NAMES = np.flip(['Executable', 'Proto', 'Source IP', 'Destination IP',  'Status', 'PID'])
-COLUMN_SIZES = np.flip([150, 50, 200, 200, 110, 65])
+COLUMN_SIZES = np.flip([200, 50, 200, 200, 140, 100])
 TEST_FILE = None
+SEC_LEVELS = ["0: Backend analysis only.", "1: Kill offending processes.", "2: Block offending connections using firewall.", "3: Kill and block connections and processes."]
 
 displaydata = None
 settings = None
 
 killme = False
 
+def loaddata():
+    global TEST_FILE
+    try:
+        TEST_FILE = pd.read_csv(find_data_file(filename), skiprows=1)
+        TEST_FILE = TEST_FILE.iloc[1:, :]
+        TEST_FILE.columns = ['Executable', 'Protocol', 'Source IP', 'Destination IP',  'Status', 'PID']
+        #fprint(TEST_FILE)
+        #fprint(len(TEST_FILE))
+        #fprint(TEST_FILE.iloc[1, 1])
+    except FileNotFoundError:
+        pass
+
+
+    
 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=(600, 250))
+        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))
+
         self.Show()
 
     def on_edit(self, event):
@@ -42,6 +60,7 @@ class HelpFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, None, -1, 'Help', size=(600, 250))
         panel = HelpPanel(self)
+        self.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
         self.Show()
 
 
@@ -122,69 +141,113 @@ class ServerPanel(wx.Panel):
     def __init__(self, parent):
         super().__init__(parent, size=(500, 500))
         #self.SetBackgroundColour((44, 51, 51))
-        
+        self.main_sizer = wx.BoxSizer(wx.VERTICAL)
-        main_sizer = wx.BoxSizer(wx.VERTICAL)
         secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.row_obj_dict = {}
         self.list_ctrl = wx.ListCtrl(
-            self, size=(-1, 200),
+            self, size=(-1, 400),
             style=wx.LC_REPORT | wx.BORDER_SUNKEN
         )
-        tb = wx.ToolBar( self, -1)
+        #tb = wx.ToolBar( self, -1)
-        self.ToolBar = tb
+        #self.ToolBar = tb
-        tb.SetToolBitmapSize(wx.Size(30, 3))
+        #tb.SetToolBitmapSize(wx.Size(30, 3))
-        tb.AddTool(wx.ID_ANY, '',wx.Bitmap(find_data_file("WXPython_30x30.png")),) 
+        #tb.AddTool(wx.ID_ANY, '',wx.Bitmap(find_data_file("WXPython_30x30.png")),) 
-        tb.AddTool(wx.ID_ANY, '',wx.Bitmap(find_data_file("settings_30x30.png"))) 
+        #tb.AddTool(wx.ID_ANY, '',wx.Bitmap(find_data_file("settings_30x30.png"))) 
-        tb.Realize() 
+        #tb.Realize() 
-        main_sizer.Add(tb)
+        if settings["running"] == True:
+            txt = "Status: Running (" + str(settings["config"]["core"]["level"]) + ")"
+        else:
+            txt = "Status: Not running"
+
+        self.statustext = wx.StaticText(self, label=txt) # pos=(20,20))
+        #self.main_sizer.Add(tb)
         #main_sizer.SetBackgroundColour((44, 51, 51))
         # self.pnl1.SetBackgroundColour(wx.BLACK)
         self.handle_columns()
-        global settings
+        #self.updatedata()
-        for i in range(len(TEST_FILE)):
+        wx.CallAfter(self.updatedata)
-            self.list_ctrl.InsertItem(i, TEST_FILE.iloc[i, 0])
-            #fprint(TEST_FILE.iloc[i, 5] + " in " + str(settings["badapps"]))
-            #if TEST_FILE.iloc[i, 5] in settings["badapps"]:
-            for pid in settings["badapps"]:
-                #fprint(pid)
-                if str(TEST_FILE.iloc[i, 5]) == str(pid):
-                    #fprint("Got " + TEST_FILE.iloc[i, 5])
-                    settings["killbox"].append(pid)
-                    fprint(settings["killbox"])
-                    self.list_ctrl.SetItemBackgroundColour(i, wx.Colour(200, 51, 51))
-            for j in range(1, 6):
-                self.list_ctrl.SetItem(i, j, str(TEST_FILE.iloc[i, j]))
         
-                #fprint(i, j, TEST_FILE.iloc[i, j])
+        wx.GetApp().ProcessPendingEvents() 
-
+        self.main_sizer.Add(self.list_ctrl, 0, wx.ALL | wx.EXPAND, 20)
-        main_sizer.Add(self.list_ctrl, 0, wx.ALL | wx.EXPAND, 20)
+        start_button = wx.Button(self, label='Start IPPigeon')
-        start_button = wx.Button(self, label='Start')
         start_button.SetBackgroundColour((205, 215, 206))
-        start_button.Bind(wx.EVT_BUTTON, self.on_edit)
+        start_button.Bind(wx.EVT_BUTTON, self.on_start)
-        start_button.Bind(wx.EVT_ENTER_WINDOW, self.on_edit)
+        #start_button.Bind(wx.EVT_ENTER_WINDOW, self.on_start)
-        stop_button = wx.Button(self, label='Stop')
+        stop_button = wx.Button(self, label='Stop IPPigeon')
         stop_button.SetBackgroundColour('#F08080')
 
-        secondary_frame_button = wx.Button(self, label='Window')
+        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_edit)
+        stop_button.Bind(wx.EVT_BUTTON, self.on_stop)
-        main_sizer.Add(start_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(self.statustext, 0,  wx.CENTER | wx.ALL | 100, 5)
-        main_sizer.Add(stop_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(start_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        main_sizer.Add(secondary_frame_button, 0, wx.CENTER | wx.ALL | 100, 5)
+        self.main_sizer.Add(stop_button, 0, wx.CENTER | wx.ALL | 100, 5)
-        self.SetSizer(main_sizer)
+        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 updatedata(self):
+        global settings
+        if settings["running"] == True:
+            txt = "Status: Running (" + str(settings["config"]["core"]["level"]) + ")"
+        else:
+            txt = "Status: Not running"
         
         
-    def on_edit(self, event):
+        if settings["newdata"] == True:
-        fprint('in on_edit')
+            settings["newdata"] = False
+        else:
+            wx.CallLater(1000, self.updatedata)
+            return
+        fprint("updatedata called")
+        loaddata()
+        if self.list_ctrl.DeleteAllItems():
+            fprint("Items deleted")
+        else:
+            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
+            idx = 0
+            for ip in settings["badips"]:
+                #fprint(pid)
+                idx = i
+                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
+            else:
+                idx = self.list_ctrl.InsertItem(i, TEST_FILE.iloc[i, 0])
+            #fprint(TEST_FILE.iloc[i, 5] + " in " + str(settings["badapps"]))
+            #if TEST_FILE.iloc[i, 5] in settings["badapps"]:
+            
+                    #fprint("Got " + TEST_FILE.iloc[i, 5])
+            for j in range(1, 6):
+                #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.statustext.SetLabel(txt)
+        wx.CallLater(1000, self.updatedata)
+
+    def on_start(self, event):
+        fprint('in on_start')
+        settings["running"] = True
+
+    def on_stop(self, event):
+        fprint('in on_stop')
+        settings["running"] = False
+        util.clear_fwll()
 
     def on_window(self, event):
-        OtherFrame()
+        fprint("open settings")
+        dg = GetData(parent = None)
+        dg.ShowModal()
 
     def ShowImage(self, imageFile):
         if imageFile == "":
@@ -194,6 +257,7 @@ class ServerPanel(wx.Panel):
             self.bitmap = wx.StaticBitmap(self, -1, bmp, (0, 0))
     
 
+
 class ServerFrame(wx.Frame):
     def __init__(self):
         super().__init__(parent=None,
@@ -214,114 +278,87 @@ def openwindow(data, sets, kill):
     settings = sets
     if settings["loggedin"]:
         fprint("Creating server panel")
-        global TEST_FILE
+        loaddata()
-        try:
-            TEST_FILE = pd.read_csv(find_data_file(filename), skiprows=1)
-            TEST_FILE = TEST_FILE.iloc[1:, :]
-            TEST_FILE.columns = ['Executable', 'Protocol', 'Source IP', 'Destination IP',  'Status', 'PID']
-            fprint(TEST_FILE)
-            fprint(len(TEST_FILE))
-            #fprint(TEST_FILE.iloc[1, 1])
-        except FileNotFoundError:
-            pass
         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")
         
         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):
-if __name__ == '__main__':
-    openwindow(list(), dict(), int())
-
-
-
-
-
-
-"""class ServerPanel(wx.Frame):   
     def __init__(self, parent):
-        super().__init__(parent)
+        wx.Dialog.__init__(self, parent, wx.ID_ANY, "User Settings: ", size = (800,500))
-        main_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.p = wx.Panel(self, wx.ID_ANY)
-        secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
         
-        menubar = wx.MenuBar() 
+        self.hostname = wx.StaticText(self.p, label="Host:", pos=(20,20))
-        menu = wx.Menu() 
+        self.hostnametext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["host"], pos=(180,20), size=(500,-1))
-        menubar.Append(menu,"File") 
-        self.SetMenuBar(menubar) 
 
-        tb = wx.ToolBar( self, -1)
+        self.user = wx.StaticText(self.p, label="User: ", pos=(20,60))
-        self.ToolBar = tb
+        self.usertext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["user"], pos=(180,60), size=(500,-1))
+
+        self.port = wx.StaticText(self.p, label="Port: ", pos=(20,100))
+        self.porttext = wx.TextCtrl(self.p, value=str(settings["config"]["sftp"]["port"]), pos=(180,100), size=(500,-1))
+
+        self.keyfile = wx.StaticText(self.p, label="Keyfile: ", pos=(20,140))
+        self.keyfiletext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["keyfile"], pos=(180,140), size=(500,-1))
+
+        self.filepathsend = wx.StaticText(self.p, label="Sending File Path: ", pos=(20,180))
+        self.filepathsendtext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["filepath"]["send"], pos=(180,180), size=(500,-1))
+
+        self.filepathsendlogin = wx.StaticText(self.p, label="Sending Login Path: ", pos=(20,220))
+        self.filepathsendlogintext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["filepath"]["sendlogin"], pos=(180,220), size=(500,-1))
+
+        self.filepathreceive = wx.StaticText(self.p, label="Receiving File Path: ", pos=(20,260))
+        self.filepathreceivetext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["filepath"]["receive"], pos=(180,260), size=(500,-1))
+
+        self.filepathreceivelogin = wx.StaticText(self.p, label="Receiving Login Path: ", pos=(20,300))
+        self.filepathreceivelogintext = wx.TextCtrl(self.p, value=settings["config"]["sftp"]["filepath"]["receivelogin"], pos=(180,300), size=(500,-1))
+
+        self.darkmode = wx.StaticText(self.p, label="Dark mode (On/Off): ", pos=(20,340))
+        self.darkmodetext = wx.TextCtrl(self.p, value=str(settings["config"]["ui"]["darkmode"]), pos=(180,340), size=(500,-1))
+
+        self.interval = wx.StaticText(self.p, label="Interval (sec): ", pos=(20,380))
+        self.intervaltext = wx.TextCtrl(self.p, value=str(settings["config"]["core"]["interval"]), pos=(180,380), size=(500,-1))
+
+        self.seclevel = wx.StaticText(self.p, label="Security Strength Level: ", pos=(20,420))
+        self.seclevelslider = wx.Slider(self.p, pos=(180,410), minValue=0, maxValue=3, style=wx.SL_HORIZONTAL | wx.SL_AUTOTICKS, value=settings["config"]["core"]["level"])
+        self.seclevel2 = wx.StaticText(self.p, label=SEC_LEVELS[settings["config"]["core"]["level"]], pos=(300,420))
+        self.seclevelslider.Bind(wx.EVT_SCROLL, self.level_upd)
+        self.Bind(wx.EVT_CLOSE, self.OnQuit)
+
+    def level_upd(self, event):
+        self.seclevel2.SetLabel(SEC_LEVELS[self.seclevelslider.GetValue()])
         
 
-        #tb.AddTool( wx.ID_ANY, '', wx.Bitmap("IPPigeonLogo.png"))
+    def OnQuit(self, event):
-        tb.AddTool(wx.ID_ANY, '',wx.Bitmap("WXPython_30x30.png"),) 
+        # save changes
-        tb.AddTool(wx.ID_ANY, '',wx.Bitmap("settings_30x30.png")) 
+        fprint("saving changes...")
+        config = settings["config"]
+        config["sftp"]["host"] = self.hostnametext.GetValue()
+        config["sftp"]["user"] = self.usertext.GetValue()
+        config["sftp"]["port"] = int(self.porttext.GetValue())
+        config["sftp"]["keyfile"] = self.keyfiletext.GetValue()
+        config["sftp"]["filepath"]["send"] = self.filepathsendtext.GetValue()
+        config["sftp"]["filepath"]["sendlogin"] = self.filepathsendlogintext.GetValue()
+        config["sftp"]["filepath"]["receive"] = self.filepathreceivetext.GetValue()
+        config["sftp"]["filepath"]["receivelogin"] = self.filepathreceivelogintext.GetValue()
+        config["ui"]["darkmode"] = bool(self.darkmodetext.GetValue())
+        config["core"]["interval"] = int(self.intervaltext.GetValue())
+        config["core"]["level"] = int(self.seclevelslider.GetValue())
+        settings["config"] = config
+        settings["applyconfig"] = True
 
-        #tb.Bind(wx.EVT_TOOL, self.Onright)
+        self.result_name = None
-        #tb.Bind(wx.EVT_COMBOBOX,self.OnCombo) 
+        self.Destroy()
-        #self.combo = wx.ComboBox( tb, 555, value = "Times", choices = ["Papyrus","Times","Comic Sans"])  
-
-        #tb.AddControl(self.combo ) 
-        tb.Realize() 
-        main_sizer.Add(tb)
-
-        self.Show(True) 
-
-
-        self.row_obj_dict = {}
-        self.list_ctrl = wx.ListCtrl(
-            self, size=(-1, 100), 
-            style=wx.LC_REPORT | wx.BORDER_SUNKEN
-        )
-        self.SetBackgroundColour(wx.BLACK)
-        self.list_ctrl.InsertColumn(0, 'Server name', width=140)
-        self.list_ctrl.InsertColumn(1, 'Port number', width=140)
-        self.list_ctrl.InsertColumn(2, 'Status', width=200)
-        main_sizer.Add(self.list_ctrl, 0, wx.ALL | wx.EXPAND, 5)
-        start_button = wx.Button(self, label='Start')
-        start_button.SetBackgroundColour((205, 215, 206))
-        start_button.Bind(wx.EVT_BUTTON, self.on_edit)
-        stop_button = wx.Button(self, label='Stop')
-        stop_button.SetBackgroundColour('#F08080')
-        # wx.BORDER(stop_button, wx.BORDER_NONE)
-        stop_button.Bind(wx.EVT_BUTTON, self.on_edit)
-        main_sizer.Add(start_button, 0, wx.CENTER | 100, 5)
-        main_sizer.Add(stop_button, 0, wx.CENTER | 100, 5)
-        # start_button.SetWindowStyleFlag(wx.SIMPLE_BORDER)
-        # stop_button.SetWindowStyleFlag(wx.SIMPLE_BORDER)
-        # wx.StaticBitmap(self, -1, png, (500, 300), (png.GetWidth(), png.GetHeight()))
-        self.SetSizer(main_sizer)
-    
-    def OnQuit(self, e):
-        self.Close()
 
     def on_edit(self, event):
         print('in on_edit')
 
-    def update_mp3_listing(self, folder_path):
-        print(folder_path)
-
-    # def Onright(self, event): 
-    #     self.text.AppendText(str(event.GetId())+"\n")
-		
-    # def OnCombo(self,event): 
-    #     self.text.AppendText( self.combo.GetValue()+"\n") 
-
-class ServerFrame(wx.Frame):    
-    def __init__(self):
-        super().__init__(parent=None, title='Server Dashboard')
-        self.frame = ServerPanel(self)
-            # image = wx.StaticBitmap(self, wx.ID_ANY)
-            # image.SetBitmap(wx.Bitmap('WXPython.png'))
-        self.Show()
-
 if __name__ == '__main__':
-    app = wx.App(False)
+    openwindow(list(), dict(), int())
-    frame = ServerFrame()
-    
-    app.MainLoop()"""

requirements.txt

@@ -4,3 +4,5 @@ wxpython
 cx_Freeze
 pandas
 pyyaml
+numpy
+bcrypt

setup.py

@@ -2,10 +2,10 @@ import sys
 from cx_Freeze import setup, Executable
 
 debug = True
-#debug = not debug
+debug = not debug
 # Dependencies are automatically detected, but it might need fine tuning.
 # "packages": ["os"] is used as example only
-build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "config.yml", "keyfile-admin.pem", "WXPython.png", "WXPython_30x30.png", "settings.png", "settings_30x30.png"], "optimize": 1}
+build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "config.yml", "keyfile-admin.pem", "WXPython.png", "WXPython_30x30.png", "settings.png", "settings_30x30.png", "icon.ico"], "optimize": 1}
 
 # base="Win32GUI" should be used only for Windows GUI app
 base = None

taskbartool.py

@@ -32,7 +32,7 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
     def CreatePopupMenu(self):
         menu = wx.Menu()
         create_menu_item(menu, 'Control Panel', self.on_open)
-        create_menu_item(menu, 'Login test', self.on_login)
+        #create_menu_item(menu, 'Login test', self.on_login)
         menu.AppendSeparator()
         create_menu_item(menu, 'Exit', self.on_exit)
         return menu

util.py

@@ -4,6 +4,7 @@ import subprocess
 import os
 from sys import platform
 import time as t
+from time import sleep
 import uuid
 
 win32 = platform == "win32"
@@ -39,6 +40,13 @@ if linux:
 def time():
     return int(t.time())
 
+def kill(pid):
+    setup_child()
+    if pid > 0:
+        fprint("Killing PID " + str(pid))
+        os.kill(int(pid), 9)
+        fprint("Signal 9 sent to PID " + str(pid))
+
 def fprint(msg):
     #if not getattr(sys, "frozen", False):
     setup_child()
@@ -110,3 +118,7 @@ class Logger(object):
         
     def flush(self):
         print("", end="")
+
+def clear_fwll():
+    if win32:
+        run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')