Merge pull request #1 from sequoiaheightsms/1.3-2

1.3 2

rpmbuild/SOURCES/honeypot-probe.cpp

@@ -38,8 +38,29 @@ int execWithResult(const std::string& cmd) {
     return result;
 }
 
+// Function to check if an IP already exists in the blocklist file
+bool ipExistsInBlocklist(const std::string& blocklistFile, const std::string& ip) {
+    std::ifstream file(blocklistFile);
+    if (!file.is_open()) {
+        throw std::runtime_error("Error opening file for reading: " + blocklistFile);
+    }
+
+    std::string line;
+    while (std::getline(file, line)) {
+        if (line == ip) {
+            return true; // IP already exists in the blocklist
+        }
+    }
+    return false;
+}
+
 // Function to add an IP to the local blocklist file and commit to GitHub
 void addIPToBlocklist(const std::string& blocklistFile, const std::string& ip) {
+    if (ipExistsInBlocklist(blocklistFile, ip)) {
+        std::cout << "IP " << ip << " already exists in blocklist. Skipping." << std::endl;
+        return;
+    }
+
     std::ofstream file(blocklistFile, std::ios::app);
     if (!file.is_open()) {
         throw std::runtime_error("Error opening file for writing: " + blocklistFile);

rpmbuild/SPECS/honeypot-blocklist.spec

@@ -1,6 +1,6 @@
 Name:           honeypot-blocklist
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Honeypot Blocklist Service
 
 License:        MIT License
@@ -103,6 +103,8 @@ systemctl daemon-reload
 /etc/logrotate.d/honeypot-client
 
 %changelog
+* Thu May 16 2024 Sequoia Heights MS <[email protected]> - 1.3-2
+- Bug Fix: Explicitly check if the IP already exists in the blocklist file before adding it
 * Thu May 16 2024 Sequoia Heights MS <[email protected]> - 1.3-1
 - Split into probe and client packages
 - Probe: collects IPs from fail2ban and uploads to GitHub