Compare commits

...

6 Commits

Author SHA1 Message Date
d62fa3b79f Add manual blacklist functionality 2022-11-22 20:45:29 -06:00
86eeb716ac fix macos invalid data temporarily 2022-11-22 19:32:01 -06:00
f6cc6b6fef testing- add blacklist button 2022-11-22 19:14:21 -06:00
b4a46ad253 Add quit button 2022-11-22 18:49:41 -06:00
9ac35912dd update block ratio format 2022-11-22 16:29:06 -06:00
599a84a143 add statistics 2022-11-15 21:00:26 -06:00
8 changed files with 179 additions and 41 deletions

View File

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

View File

@ -10,7 +10,7 @@ import time
import csv
import ssh
def get_blocklist(config):
def get_blocklist(config, appendbad):
setup_child()
fprint("Downloading deny list from server")
data = ssh.check_for_file(config, "BadIPs.csv", "receive")
@ -21,13 +21,9 @@ def get_blocklist(config):
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"])
for line in appendbad:
data2.append(line)
fprint(data2)
@ -52,7 +48,7 @@ def block_conn(config, datafile, res):
baddata = res
fprint("Local loaded successfully")
goodct = 0
#fprint(mydata)
for line in mydata:
#fprint(line)
@ -61,19 +57,25 @@ def block_conn(config, datafile, res):
continue
srcip = line[2].split(":")[0]
srcport = line[2].split(":")[1]
destip = line[3].split(":")[0]
destport = line[3].split(":")[1]
pid = line[5]
try:
pid = int(pid)
except ValueError:
continue
found = False
for line in baddata:
#fprint(destip + " " + line[4])
badsrcip = line[2]
badsrcport = line[3]
baddestip = line[4]
baddestport = line[5]
badpid = line[11]
if srcip == badsrcip or destip == baddestip and not pid in badapps:
if ((srcip == badsrcip and srcport == badsrcport) or (destip == baddestip and destport == baddestport)) 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

View File

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

View File

@ -18,8 +18,7 @@ import auth
import panel
import block
badapps = [756, 278670]
badips = ["208.59.79.12",]
history = list()
displaydata = None
settings = None
netdata_res = None
@ -66,11 +65,15 @@ def netstat_done(res):
def process_done(res):
if settings["running"] == True:
fprint("uploading to sftp...")
#ssh.sftp_send_data(res, config, datafile)
#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
tmpstat = settings["stats"]
tmpstat[2] += 1
settings["stats"] = tmpstat
def login_done(res):
if not res:
@ -87,7 +90,16 @@ def blockdata_done(res):
tmpkill = settings["kill"]
settings["kill"] = False
#block_res = pool.apply_async(block.block_conn, (config, datafile, res, settings))
block_pids, block_ips, block_data = 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:
@ -117,6 +129,11 @@ def blockdata_done(res):
settings["newdata"] = True
def readstat_done(res):
settings["stats"] = res
fprint("Read stats!" + str(settings["stats"]))
def killall():
kids = active_children()
for kid in kids:
@ -143,6 +160,8 @@ def mainloop(pool):
#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))
@ -172,7 +191,7 @@ def mainloop(pool):
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, settings["appendbad"]), callback=blockdata_done)
#block.get_blocklist(config)
settings["block"] = False
@ -200,18 +219,24 @@ def mainloop(pool):
if settings["fwll"] == True:
tmplist = settings["badlines"]
tmpstat = settings["stats"]
tmpstat[0] += len(tmplist)
settings["stats"] = tmpstat
settings["badlines"] = list()
for line in tmplist:
badproto = line[1]
badip = line[4]
badport = line[5]
fprint("Firewalling " + badip + ":" + str(badport))
if 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 (badip, badport) not in history:
if win32:
cmd = 'New-NetFirewallRule -DisplayName "IPPigeon Security Rule ' + badip + ':' + str(badport) + '" -Group "IPPigeon" -Direction Outbound -LocalPort Any -Protocol ' + badproto + ' -Action Block -RemoteAddress ' + badip + ' -RemotePort ' + str(badport)
run_cmd(cmd)
if linux:
cmd = "nft add rule ip ippigeon output ip daddr " + badip + " " + badproto.lower() + " dport " + str(badport) + " drop"
run_cmd(cmd)
else:
history.append((badip, badport))
if settings["applyconfig"] == True:
@ -263,6 +288,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
@ -273,16 +299,30 @@ if __name__ == '__main__':
settings["badlines"] = list()
settings["block"] = False
settings["kill"] = False
settings["config"] = config
settings["config"] = config
settings["applyconfig"] = False
settings["fwll"] = 0
settings["running"] = config["core"]["autostart"]
settings["newdata"] = False
settings["appendbad"] = list()
tmp = list()
tmp.append(["N/A", "TCP", "N/A", "N/A", "20.112.52.29", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "20.81.111.85", "80", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "100.115.71.78", "5000", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "174.143.130.167", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "216.47.134.203", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
tmp.append(["N/A", "TCP", "N/A", "N/A", "34.111.83.189", "443", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
settings["appendbad"] = tmp
# connections blocked, total connections allowed, count of data sent, data recieved, ratio blocked-unblocked
settings["stats"] = [0, 0, 0, 0, 0.0]
killme = manager.Value('d', 0)
#killme = False
# launch background UI app as process
util.clear_fwll()
p = Process(target=taskbartool.background, args=(displaydata,settings,killme))
p.start()
#p.join() # not a foreground job, so let's not join it
keeprunning = True
@ -290,12 +330,13 @@ if __name__ == '__main__':
# 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):

View File

@ -146,7 +146,6 @@ def process(data):
writer.writerows(output2)
fprint("done creating csv")
def start():
setup_child()

View File

@ -148,6 +148,8 @@ class ServerPanel(wx.Panel):
self.secondary_sizer = wx.BoxSizer(wx.HORIZONTAL)
self.sub_sizer_left = wx.BoxSizer(wx.VERTICAL)
self.sub_sizer_right = wx.BoxSizer(wx.VERTICAL)
self.sub_sizer_stats = wx.BoxSizer(wx.VERTICAL)
self.sub_sizer_filter = wx.BoxSizer(wx.VERTICAL)
self.row_obj_dict = {}
self.list_ctrl = wx.ListCtrl(
self, size=(-1, 400),
@ -168,18 +170,23 @@ class ServerPanel(wx.Panel):
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, 0, wx.ALL | wx.EXPAND, 20)
self.main_sizer.Add(self.list_ctrl, 1, wx.ALL | wx.EXPAND, 20)
self.main_sizer.Add(self.secondary_sizer, 0, wx.ALL | wx.EXPAND, 20)
self.secondary_sizer.Add(self.sub_sizer_left, 0, wx.ALL | wx.CENTER, 20)
self.secondary_sizer.Add(self.sub_sizer_right, 0, wx.ALL | wx.CENTER, 20)
self.secondary_sizer.Add(self.sub_sizer_filter, 0, wx.ALL | wx.CENTER, 20)
self.secondary_sizer.Add(self.sub_sizer_stats, 0, wx.ALL | wx.CENTER, 20)
self.start_button = wx.Button(self, label='Start IPPigeon')
self.start_button.SetBackgroundColour((205, 215, 206))
self.start_button.Bind(wx.EVT_BUTTON, self.on_start)
@ -194,6 +201,13 @@ class ServerPanel(wx.Panel):
self.login_button = wx.Button(self, label='Login')
#self.login_button.SetBackgroundColour((205, 215, 206))
self.login_button.Bind(wx.EVT_BUTTON, self.on_login)
self.quit_button = wx.Button(self, label='Quit IPPigeon')
#self.login_button.SetBackgroundColour((205, 215, 206))
self.quit_button.Bind(wx.EVT_BUTTON, self.on_quit)
self.blacklist_button = wx.Button(self, label='Add to blacklist')
#self.login_button.SetBackgroundColour((205, 215, 206))
self.blacklist_button.Bind(wx.EVT_BUTTON, self.on_blacklist)
self.sub_sizer_right.Add(self.statustext, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_right.Add(self.logintext, 0, wx.CENTER | wx.ALL | 100, 5)
@ -201,6 +215,9 @@ class ServerPanel(wx.Panel):
self.sub_sizer_left.Add(self.stop_button, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_left.Add(self.secondary_frame_button, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_right.Add(self.login_button, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_right.Add(self.quit_button, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_stats.Add(self.stattext, 0, wx.CENTER | wx.ALL | 100, 5)
self.sub_sizer_filter.Add(self.blacklist_button, 0, wx.CENTER | wx.ALL | 100, 5)
self.SetSizer(self.main_sizer)
self.start_button.Enable(enable=settings["loggedin"])
self.stop_button.Enable(enable=settings["loggedin"])
@ -218,14 +235,18 @@ class ServerPanel(wx.Panel):
self.start_button.Enable(enable=settings["loggedin"])
self.stop_button.Enable(enable=settings["loggedin"])
self.secondary_frame_button.Enable(enable=settings["loggedin"])
self.quit_button.Enable(enable=settings["loggedin"])
if self.list_ctrl.GetFirstSelected() < 0:
self.blacklist_button.Enable(enable=False)
else:
self.blacklist_button.Enable(enable=settings["loggedin"])
def updatedata(self):
global settings
if settings["running"] == True:
txt = "Status: Running (" + str(settings["config"]["core"]["level"]) + ")"
else:
txt = "Status: Not running"
self.list_ctrl.SetSize(self.GetSize()[0] - 50, self.GetSize()[1] - 200)
#self.list_ctrl.SetSize(self.GetSize()[0] - 50, self.GetSize()[1] - 200)
self.checklogin()
if settings["loggedin"] == True:
logintxt = " Logged in"
@ -233,8 +254,12 @@ class ServerPanel(wx.Panel):
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:
@ -242,6 +267,10 @@ class ServerPanel(wx.Panel):
return
fprint("updatedata called")
loaddata()
list_total = self.list_ctrl.GetItemCount()
list_top = self.list_ctrl.GetTopItem()
list_pp = self.list_ctrl.GetCountPerPage()
list_bottom = min(list_top + list_pp, list_total - 1)
if self.list_ctrl.DeleteAllItems():
fprint("Items deleted")
else:
@ -250,10 +279,11 @@ class ServerPanel(wx.Panel):
if str(TEST_FILE.iloc[i, 4]).find("TIME_WAIT") >= 0 or str(TEST_FILE.iloc[i, 4]).find("FIN_WAIT_2") >= 0:
continue
idx = 0
for ip in settings["badips"]:
for app in settings["badapps"]:
#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
if TEST_FILE.iloc[i, 5] == app: # "bad" pid, highlight in red at the top
fprint("BAD APP UI: " + str(app))
idx = self.list_ctrl.InsertItem(0, TEST_FILE.iloc[i, 0])
self.list_ctrl.SetItemBackgroundColour(idx, wx.Colour(200, 51, 51))
break
@ -266,10 +296,12 @@ class ServerPanel(wx.Panel):
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.list_ctrl.EnsureVisible((list_bottom - 1))
wx.CallLater(100, self.updatedata)
def on_start(self, event):
@ -294,7 +326,25 @@ class ServerPanel(wx.Panel):
dg2 = ServerFrame()
#dg2.ShowModal()
def on_quit(self, event):
global killme
killme.value += 1
self.Close()
self.Parent.Close()
def on_blacklist(self, event):
global settings
tmp = settings["appendbad"]
idx = self.list_ctrl.GetFirstSelected()
if idx < 0:
return
proto = self.list_ctrl.GetItem(idx, 1).GetText()
dest = self.list_ctrl.GetItem(idx, 3).GetText()
destip, destport = dest.split(":")
fprint([proto, destip, destport])
tmp.append(["N/A", proto, "N/A", "N/A", destip, destport, "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A"])
settings["appendbad"] = tmp
def ShowImage(self, imageFile):
if imageFile == "":
self.bitmap = wx.StaticBitmap(self, -1, size=(0, 0))

25
ssh.py
View File

@ -3,23 +3,32 @@ from fabric import Connection
from util import find_data_file
from util import setup_child
from util import fprint
from util import macos
from invoke import exceptions
import sys
c = None
def sftp_send_data(config, filename, filetype):
setup_child()
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)
fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
fprint("Data sent over SFTP successfully")
if not macos:
fprint("Connecting over SSH to " + config['sftp']['host'])
global c
if c is None:
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
fprint("Sending data over SFTP: " + filename)
fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
fprint("Data sent over SFTP successfully")
#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'])
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
global c
if c is None:
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename)
try:
res = c.run("ls -l " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
@ -31,7 +40,9 @@ def check_for_file(config, filename, location):
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']),})
global c
if c is None:
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
fprint("cd to " + config['sftp']['filepath'][location])
with c.cd(config['sftp']['filepath'][location]):
fprint("Running ssh command: " + command)

31
util.py
View File

@ -6,6 +6,7 @@ from sys import platform
import time as t
from time import sleep
import uuid
import csv
win32 = platform == "win32"
linux = platform == "linux" or platform == "linux2"
@ -124,3 +125,33 @@ def clear_fwll():
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