Add table name as secondary key, because each table manage each synch…

…ronizations
wazuh · Oct 6, 2023 · 0581eae · 0581eae
1 parent c67501d
commit 0581eae
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/shared_modules/rsync/src/rsyncImplementation.cpp b/src/shared_modules/rsync/src/rsyncImplementation.cpp
@@ -112,7 +112,7 @@ void RSyncImplementation::startRSync(const RSYNC_HANDLE handle,
             checksumCtx.rightCtx.type = IntegrityMsgType::INTEGRITY_CLEAR;
         }
 
-        m_synchronizationController.start(handle, checksumCtx.rightCtx.id);
+        m_synchronizationController.start(handle, jsStartParamsTable, checksumCtx.rightCtx.id);
         // rightCtx will have the final checksum based on fillChecksum method. After processing all checksum select data
         // checksumCtx.rightCtx will have the needed (final) information
         messageCreator->send(callbackWrapper, startConfiguration, checksumCtx.rightCtx);
@@ -160,7 +160,7 @@ void RSyncImplementation::registerSyncId(const RSYNC_HANDLE handle,
         {
             try
             {
-                m_synchronizationController.checkId(handle, syncData.id);
+                m_synchronizationController.checkId(handle, syncConfiguration.at("table"), syncData.id);
 
                 if (0 == syncData.command.compare("checksum_fail"))
                 {

diff --git a/src/shared_modules/rsync/src/synchronizationController.hpp b/src/shared_modules/rsync/src/synchronizationController.hpp
@@ -24,10 +24,10 @@ namespace RSync
     class SynchronizationController final
     {
         public:
-            void start(const RSYNC_HANDLE key, const int32_t value)
+            void start(const RSYNC_HANDLE key, const std::string& table, const int32_t value)
             {
                 std::lock_guard<std::mutex> lock{ m_mutex };
-                m_data[key] = value;
+                m_data[key][table] = value;
             }
 
             void stop(const RSYNC_HANDLE key)
@@ -45,7 +45,7 @@ namespace RSync
                 m_data.clear();
             }
 
-            void checkId(const RSYNC_HANDLE key, const int32_t value)
+            void checkId(const RSYNC_HANDLE key, const std::string& table, const int32_t value)
             {
                 std::lock_guard<std::mutex> lock{ m_mutex };
                 const auto it = m_data.find(key);
@@ -55,21 +55,26 @@ namespace RSync
                 }
                 else
                 {
-                    if (value < it->second)
-                    {
-                        it->second =  value;
-                    }
+                    const auto itTable = it->second.find(table);
 
-                    if (value > it->second)
+                    if (itTable != it->second.end())
                     {
-                        Log::debugVerbose << "Sync id: " << std::to_string(value) << " is not the current id: "
-                            << std::to_string(it->second) << LogEndl;
-                        throw std::runtime_error { "Sync id is not the current id" };
+                        if (value < itTable->second)
+                        {
+                            itTable->second = value;
+                        }
+
+                        if (value > itTable->second)
+                        {
+                            Log::debugVerbose << "Sync id: " << std::to_string(value) << " is not the current id: "
+                                << std::to_string(itTable->second) << " for table: "<< table << LogEndl;
+                            throw std::runtime_error { "Sync id is not the current id" };
+                        }
                     }
                 }
             }
         private:
-            std::unordered_map<RSYNC_HANDLE, int32_t> m_data;
+            std::unordered_map<RSYNC_HANDLE, std::unordered_map<std::string, int32_t>> m_data;
             std::mutex m_mutex;
     };
 } // namespace RSync