Fix update_db() calls

This commit is contained in:
marcelb 2024-02-13 21:33:33 +01:00
parent 02689b498d
commit 68e509b385
4 changed files with 13 additions and 22 deletions

2
.vscode/tasks.json vendored
View File

@ -9,7 +9,7 @@
"-g", "-g",
"${fileDirname}/test.cpp", "${fileDirname}/test.cpp",
"${fileDirname}/../src/*.cpp", "${fileDirname}/../src/*.cpp",
"${fileDirname}/../exec/src/*.cpp", "${fileDirname}/../../exec/src/*.cpp",
"-o", "-o",
"${fileDirname}/test.o" "${fileDirname}/test.o"
], ],

View File

@ -32,14 +32,6 @@ marcelb::ipban::ipban(const uint& _duration, const uint& _fail_interval, const u
marcelb::ipban::~ipban() { marcelb::ipban::~ipban() {
run_unban_bot = false; run_unban_bot = false;
unban_bot.get(); unban_bot.get();
/**
* ako aplikaciju sruši napadač - želimo da ostane banovan - unbanovat će se po isteku intervala
*/
// for (uint i=0; i<banned.size(); i++) {
// unban(banned.begin() + i);
// }
} }
void marcelb::ipban::load_db() { void marcelb::ipban::load_db() {
@ -78,7 +70,7 @@ bool marcelb::ipban::ban(const string& ip) {
status = ufw_ban(ip); status = ufw_ban(ip);
io.lock(); io.lock();
banned.push_back({ip, time(NULL)}); banned.push_back({ip, time(NULL)});
status = status && update_db(); status &= update_db();
io.unlock(); io.unlock();
} }
return status; return status;
@ -88,7 +80,7 @@ bool marcelb::ipban::unban(vector<_ban>::iterator ban_itr) {
bool status = ufw_unban(ban_itr->ip); bool status = ufw_unban(ban_itr->ip);
io.lock(); io.lock();
banned.erase(ban_itr); banned.erase(ban_itr);
status = status && update_db(); status &= update_db();
io.unlock(); io.unlock();
return status; return status;
} }

BIN
test/test

Binary file not shown.

View File

@ -33,24 +33,23 @@ int main() {
// i++; // i++;
// } // }
myban.add_white_list("192.168.2.74"); // myban.add_white_list("192.168.2.74");
cout << myban.ban("192.168.2.74") << endl; // cout << myban.ban("192.168.2.74") << endl;
sleep(2); // sleep(2);
cout << myban.ban("192.168.2.75") << endl; // cout << myban.ban("192.168.2.75") << endl;
sleep(200); // // sleep(200);
// myban.fail("192.168.2.74"); // myban.fail("192.168.2.74");
// sleep(120); // sleep(5);
// myban.unfail("192.168.2.74"); // // myban.unfail("192.168.2.74");
// sleep(2); // sleep(2);
// myban.fail("192.168.2.74"); // myban.fail("192.168.2.74");
// sleep(120); // sleep(5);
// myban.fail("192.168.2.74");
sleep(100);
return 0; return 0;
} }