paulbsd/ipblc
1
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

changed ipevent struct
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Paul 2023-01-15 23:12:07 +01:00
parent 35ac52ed46
commit 14192e1aef
4 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/config.rs
View File

@ -1,4 +1,4 @@
use crate::ip::{BlockIpData, IpData}; use crate::ip::{BlockIpData, IpData, IpEvent};
use crate::utils::{gethostname, sleep_s}; use crate::utils::{gethostname, sleep_s};
use chrono::prelude::*; use chrono::prelude::*;
@ -156,15 +156,11 @@ impl Context {
pub async fn get_blocklist_toblock(&mut self) -> Vec<IpData> { pub async fn get_blocklist_toblock(&mut self) -> Vec<IpData> {
let mut res: Vec<IpData> = vec![]; let mut res: Vec<IpData> = vec![];
//let now: DateTime<Local> = Local::now().trunc_subsecs(0);
for (_, block) in self.blocklist.iter_mut() { for (_, block) in self.blocklist.iter_mut() {
match self.cfg.sets.get(&block.ipdata.src) { match self.cfg.sets.get(&block.ipdata.src) {
Some(set) => { Some(set) => {
if block.tryfail >= set.tryfail { if block.tryfail >= set.tryfail {
res.push(block.ipdata.clone()); res.push(block.ipdata.clone());
/*if block.tryfail == set.tryfail {
block.starttime = DateTime::from(now);
}*/
} }
} }
None => {} None => {}
@ -173,27 +169,27 @@ impl Context {
res res
} }
pub async fn update_blocklist(&mut self, ipdata: &IpData) -> Option<IpData> { pub async fn update_blocklist(&mut self, ipevent: &IpEvent) -> Option<IpData> {
match self.cfg.sets.get(&ipdata.src) { match self.cfg.sets.get(&ipevent.ipdata.src) {
Some(set) => { Some(set) => {
if self.blocklist.contains_key(&ipdata.ip) if self.blocklist.contains_key(&ipevent.ipdata.ip)
&& self.hostname == ipdata.hostname && self.hostname == ipevent.ipdata.hostname
&& ipdata.mode == "file".to_string() && ipevent.mode == "file".to_string()
{ {
let mut block = self.blocklist.get_mut(&ipdata.ip).unwrap(); let mut block = self.blocklist.get_mut(&ipevent.ipdata.ip).unwrap();
block.tryfail += 1; block.tryfail += 1;
block.blocktime = set.blocktime; block.blocktime = set.blocktime;
if block.tryfail >= set.tryfail { if block.tryfail >= set.tryfail {
return Some(block.ipdata.clone()); return Some(ipevent.ipdata.clone());
} }
} else { } else {
let starttime = DateTime::parse_from_rfc3339(ipdata.date.as_str()) let starttime = DateTime::parse_from_rfc3339(ipevent.ipdata.date.as_str())
.unwrap() .unwrap()
.with_timezone(&chrono::Local); .with_timezone(&chrono::Local);
self.blocklist self.blocklist
.entry(ipdata.ip.to_string()) .entry(ipevent.ipdata.ip.to_string())
.or_insert(BlockIpData { .or_insert(BlockIpData {
ipdata: ipdata.clone(), ipdata: ipevent.ipdata.clone(),
tryfail: set.tryfail, tryfail: set.tryfail,
starttime, starttime,
blocktime: set.blocktime, blocktime: set.blocktime,
@ -209,7 +205,7 @@ impl Context {
let mut removed: Vec<IpData> = vec![]; let mut removed: Vec<IpData> = vec![];
let now: DateTime<Local> = Local::now().trunc_subsecs(0); let now: DateTime<Local> = Local::now().trunc_subsecs(0);
// nightly, future use // nightly, future use
//let drained: HashMap<String,IpData> = ctx.blocklist.drain_filter(|k,v| v.parse_date() < mindate) // let drained: HashMap<String,IpData> = ctx.blocklist.drain_filter(|k,v| v.parse_date() < mindate)
for (ip, blocked) in self.blocklist.clone().iter() { for (ip, blocked) in self.blocklist.clone().iter() {
match self.cfg.sets.get(&blocked.ipdata.src) { match self.cfg.sets.get(&blocked.ipdata.src) {
Some(set) => { Some(set) => {
@ -530,51 +526,66 @@ mod test {
ctx.blocklist = HashMap::new(); ctx.blocklist = HashMap::new();
for _i in 0..10 { for _i in 0..10 {
ctx.update_blocklist(&mut IpData { ctx.update_blocklist(&mut IpEvent {
msgtype: String::from("add"),
mode: String::from("zmq"),
ipdata: IpData {
ip: "1.1.1.1".to_string(), ip: "1.1.1.1".to_string(),
hostname: "test1".to_string(), hostname: "test1".to_string(),
date: now.to_rfc3339().to_string(), date: now.to_rfc3339().to_string(),
src: "ssh".to_string(), src: "ssh".to_string(),
mode: "file".to_string(), },
}) })
.await; .await;
} }
for _ in 0..10 { for _ in 0..10 {
ctx.update_blocklist(&mut IpData { ctx.update_blocklist(&mut IpEvent {
msgtype: String::from("add"),
mode: String::from("zmq"),
ipdata: IpData {
ip: "1.1.1.2".to_string(), ip: "1.1.1.2".to_string(),
hostname: "test2".to_string(), hostname: "test2".to_string(),
date: now.to_rfc3339().to_string(), date: now.to_rfc3339().to_string(),
src: "http".to_string(), src: "http".to_string(),
mode: "file".to_string(), },
}) })
.await; .await;
} }
ctx.update_blocklist(&mut IpData { ctx.update_blocklist(&mut IpEvent {
msgtype: String::from("add"),
mode: String::from("zmq"),
ipdata: IpData {
ip: "1.1.1.3".to_string(), ip: "1.1.1.3".to_string(),
hostname: "testgood".to_string(), hostname: "testgood".to_string(),
date: now.to_rfc3339().to_string(), date: now.to_rfc3339().to_string(),
src: "http".to_string(), src: "http".to_string(),
mode: "file".to_string(), },
}) })
.await; .await;
ctx.update_blocklist(&mut IpData { ctx.update_blocklist(&mut IpEvent {
msgtype: String::from("add"),
mode: String::from("zmq"),
ipdata: IpData {
ip: "1.1.1.4".to_string(), ip: "1.1.1.4".to_string(),
hostname: "testgood".to_string(), hostname: "testgood".to_string(),
date: now.to_rfc3339().to_string(), date: now.to_rfc3339().to_string(),
src: "http".to_string(), src: "http".to_string(),
mode: "file".to_string(), },
}) })
.await; .await;
ctx.update_blocklist(&mut IpData { ctx.update_blocklist(&mut IpEvent {
msgtype: String::from("add"),
mode: String::from("zmq"),
ipdata: IpData {
ip: "1.1.1.4".to_string(), ip: "1.1.1.4".to_string(),
hostname: "testgood".to_string(), hostname: "testgood".to_string(),
date: now.to_rfc3339().to_string(), date: now.to_rfc3339().to_string(),
src: "http".to_string(), src: "http".to_string(),
mode: "file".to_string(), },
}) })
.await; .await;

6
src/ip.rs
View File

@ -21,6 +21,7 @@ lazy_static! {
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct IpEvent { pub struct IpEvent {
pub msgtype: String, pub msgtype: String,
pub mode: String,
pub ipdata: IpData, pub ipdata: IpData,
} }
@ -30,7 +31,6 @@ pub struct IpData {
pub src: String, pub src: String,
pub date: String, pub date: String,
pub hostname: String, pub hostname: String,
pub mode: String,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
@ -66,12 +66,11 @@ impl Display for IpData {
fn fmt(&self, f: &mut Formatter) -> std::fmt::Result { fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
write!( write!(
f, f,
"ip: {ip}, src: {src}, date: {date}, hostname: {hostname}, mode: {mode}", "ip: {ip}, src: {src}, date: {date}, hostname: {hostname}",
ip = self.ip, ip = self.ip,
src = self.src, src = self.src,
date = self.date, date = self.date,
hostname = self.hostname, hostname = self.hostname,
mode = self.mode,
) )
} }
} }
@ -134,7 +133,6 @@ pub fn filter(
src: src.to_owned(), src: src.to_owned(),
date: s_date.to_rfc3339().to_owned(), date: s_date.to_rfc3339().to_owned(),
hostname: hostname.to_owned(), hostname: hostname.to_owned(),
mode: "file".to_owned(),
}); });
ips += 1; ips += 1;
}; };

8
src/ipblc.rs
View File

@ -53,12 +53,12 @@ pub async fn run() {
let ipevent_bootstrap = IpEvent { let ipevent_bootstrap = IpEvent {
msgtype: String::from("bootstrap"), msgtype: String::from("bootstrap"),
mode: String::from("zmq"),
ipdata: IpData { ipdata: IpData {
ip: "".to_string(), ip: "".to_string(),
src: "".to_string(), src: "".to_string(),
date: "".to_string(), date: "".to_string(),
hostname: "".to_string(), hostname: "".to_string(),
mode: "".to_string(),
}, },
}; };
send_to_ipbl_zmq(&zmqreqsocket, &ipevent_bootstrap, &mut ret).await; send_to_ipbl_zmq(&zmqreqsocket, &ipevent_bootstrap, &mut ret).await;
@ -84,6 +84,7 @@ pub async fn run() {
for ip_to_send in ctx.get_blocklist_toblock().await { for ip_to_send in ctx.get_blocklist_toblock().await {
let ipe = IpEvent{ let ipe = IpEvent{
msgtype: String::from("init"), msgtype: String::from("init"),
mode: String::from("zmq"),
ipdata: ip_to_send, ipdata: ip_to_send,
}; };
send_to_ipbl_zmq(&zmqreqsocket, &ipe, &mut ret).await; send_to_ipbl_zmq(&zmqreqsocket, &ipe, &mut ret).await;
@ -92,14 +93,16 @@ pub async fn run() {
} }
// refresh context blocklist // refresh context blocklist
let filtered_ip = ctx.update_blocklist(&received_ip.ipdata).await; let filtered_ip = ctx.update_blocklist(&received_ip).await;
// send ip list to ws and zmq sockets // send ip list to ws and zmq sockets
if let Some(ip) = filtered_ip { if let Some(ip) = filtered_ip {
println!("{}",ip);
if received_ip.msgtype != "init" { if received_ip.msgtype != "init" {
println!("sending {} to ws and zmq", ip.ip); println!("sending {} to ws and zmq", ip.ip);
let event = IpEvent{ let event = IpEvent{
msgtype: String::from("add"), msgtype: String::from("add"),
mode:String::from("zmq"),
ipdata: ip, ipdata: ip,
}; };
send_to_ipbl_ws(&ctx, &event, &mut ret).await; send_to_ipbl_ws(&ctx, &event, &mut ret).await;
@ -248,6 +251,7 @@ async fn compare_files_changes(
for ip in iplist { for ip in iplist {
let ipevent = IpEvent { let ipevent = IpEvent {
msgtype: String::from("add"), msgtype: String::from("add"),
mode: String::from("file"),
ipdata: ip, ipdata: ip,
}; };
ipeventtx.send(ipevent).await.unwrap(); ipeventtx.send(ipevent).await.unwrap();

2
src/ws.rs
View File

@ -28,7 +28,6 @@ async fn push_ip(ctx: &Context, ip: &IpData, ret: &mut Vec<String>) -> Result<()
src: ip.src.to_string(), src: ip.src.to_string(),
date: ip.date.to_string(), date: ip.date.to_string(),
hostname: ip.hostname.to_string(), hostname: ip.hostname.to_string(),
mode: "file".to_string(),
}); });
let resp = ctx let resp = ctx
@ -65,7 +64,6 @@ async fn _push_ip_bulk(
src: ip.src.to_string(), src: ip.src.to_string(),
date: ip.date.to_string(), date: ip.date.to_string(),
hostname: ip.hostname.to_string(), hostname: ip.hostname.to_string(),
mode: "file".to_string(),
}) })
} }