From 9d0df10d238685912318917389ea4859104281a3 Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Tue, 10 Sep 2024 14:57:33 +1200 Subject: [PATCH] honor enable_ip_blocking = false --- src/lib.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 654bdd7..e04b3a2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -314,13 +314,17 @@ async fn websocket_thread(peer: HashedPeer, websocket: HyperWebsocket, origin: S }; // Update ip data (including ban time) - // if GLOBALS.config.read().enable_ip_blocking { - let mut ban_seconds = 0; let minimum_ban_seconds = GLOBALS.config.read().minimum_ban_seconds; - if let Ok(mut ip_data) = get_ip_data(GLOBALS.store.get().unwrap(), peer.ip()) { - ban_seconds = ip_data.update_on_session_close(session_exit, minimum_ban_seconds); - let _ = update_ip_data(GLOBALS.store.get().unwrap(), peer.ip(), &ip_data); - } + let ban_seconds = if GLOBALS.config.read().enable_ip_blocking { + let mut ban_seconds = 0; + if let Ok(mut ip_data) = get_ip_data(GLOBALS.store.get().unwrap(), peer.ip()) { + ban_seconds = ip_data.update_on_session_close(session_exit, minimum_ban_seconds); + let _ = update_ip_data(GLOBALS.store.get().unwrap(), peer.ip(), &ip_data); + } + ban_seconds + } else { + minimum_ban_seconds + }; // we cheat somewhat and log these websocket open and close messages // as server messages