Apply clang format and clang tidy to common

.github/workflows/clang-format-check.yml

@@ -6,6 +6,7 @@ on:
       - opened
       - synchronize
       - reopened
+  workflow_dispatch:
 
 jobs:
   clang-format:

src/CMakeLists.txt

@@ -40,7 +40,6 @@ else()
     add_subdirectory(common/file_helper)
     add_subdirectory(common/logger)
     add_subdirectory(common/pal)
-    add_subdirectory(common/utils)
 endif()
 
 add_subdirectory(modules)

src/common/CMakeLists.txt

@@ -3,6 +3,7 @@ add_subdirectory(cmdHelper)
 add_subdirectory(config)
 add_subdirectory(data_provider)
 add_subdirectory(dbsync)
+add_subdirectory(deleterHelper)
 add_subdirectory(encodingHelper)
 add_subdirectory(file_helper)
 add_subdirectory(globHelper)
@@ -19,7 +20,6 @@ add_subdirectory(sqliteWrapper)
 add_subdirectory(stringHelper)
 add_subdirectory(threadDispatcher)
 add_subdirectory(timeHelper)
-add_subdirectory(utils)
 add_subdirectory(windowsHelper)
 
 if(BUILD_TESTS)

src/common/audit_op/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: Never

src/common/binaries_op/.clang-format

@@ -0,0 +1,2 @@
+DisableFormat: true
+SortIncludes: Never

src/common/byteArrayHelper/CMakeLists.txt

@@ -5,9 +5,12 @@ project(byte_array_helper)
 include(../../cmake/CommonSettings.cmake)
 set_common_settings()
 
-add_library(byte_array_helper INTERFACE)
+add_library(byte_array_helper src/byteArrayHelper.cpp)
 
-target_include_directories(byte_array_helper INTERFACE include)
+target_include_directories(byte_array_helper PUBLIC include)
+
+include(../../cmake/ConfigureTarget.cmake)
+configure_target(byte_array_helper)
 
 if(BUILD_TESTS)
     enable_testing()

src/common/byteArrayHelper/include/byteArrayHelper.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace Utils
+{
+    /// @brief Converts a byte array to an int32_t in big endian format
+    /// @param bytes the byte array to convert
+    /// @return the resulting int32_t
+    int32_t toInt32BE(const uint8_t* bytes);
+
+    /// @brief Converts a byte array to an int32_t in little endian format
+    /// @param bytes the byte array to convert
+    /// @return the resulting int32_t
+    int32_t toInt32LE(const uint8_t* bytes);
+} // namespace Utils

src/common/byteArrayHelper/src/byteArrayHelper.cpp

@@ -0,0 +1,28 @@
+#include "byteArrayHelper.hpp"
+
+namespace Utils
+{
+    /// @brief Bytes shift
+    enum BytesShift : uint8_t
+    {
+        THREE_BYTE = 24,
+        TWO_BYTE = 16,
+        ONE_BYTE = 8,
+        ZERO_BYTE = 0
+    };
+
+    // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+    int32_t toInt32BE(const uint8_t* bytes)
+    {
+        return static_cast<int32_t>(bytes[3]) << ZERO_BYTE | static_cast<int32_t>(bytes[2]) << ONE_BYTE |
+               static_cast<int32_t>(bytes[1]) << TWO_BYTE | static_cast<int32_t>(bytes[0]) << THREE_BYTE;
+    }
+
+    int32_t toInt32LE(const uint8_t* bytes)
+    {
+        return static_cast<int32_t>(bytes[0]) << ZERO_BYTE | static_cast<int32_t>(bytes[1]) << ONE_BYTE |
+               static_cast<int32_t>(bytes[2]) << TWO_BYTE | static_cast<int32_t>(bytes[3]) << THREE_BYTE;
+    }
+
+    // NOLINTEND(cppcoreguidelines-pro-bounds-pointer-arithmetic)
+} // namespace Utils

src/common/byteArrayHelper/tests/CMakeLists.txt

@@ -9,7 +9,6 @@ add_executable(byte_array_helper_tests
     ${UTIL_CXX_UNITTEST_COMMON_SRC}
 )
 
-include(../../../cmake/ConfigureTarget.cmake)
 configure_target(byte_array_helper_tests)
 
 target_include_directories(byte_array_helper_tests PRIVATE

src/common/byteArrayHelper/tests/byteArrayHelper_test.cpp

@@ -1,16 +1,5 @@
-/*
- * Wazuh shared modules utils
- * Copyright (C) 2015, Wazuh Inc.
- * March 16, 2021.
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General Public
- * License (version 2) as published by the FSF - Free Software
- * Foundation.
- */
-
-#include "byteArrayHelper_test.h"
-#include "byteArrayHelper.h"
+#include "byteArrayHelper_test.hpp"
+#include "byteArrayHelper.hpp"
 
 void ByteArrayHelperTest::SetUp() {};
 

src/common/byteArrayHelper/tests/byteArrayHelper_test.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "gtest/gtest.h"
+
+class ByteArrayHelperTest : public ::testing::Test
+{
+protected:
+    ByteArrayHelperTest() = default;
+    virtual ~ByteArrayHelperTest() = default;
+
+    void SetUp() override;
+    void TearDown() override;
+};

src/common/cmdHelper/CMakeLists.txt

@@ -5,11 +5,14 @@ project(cmd_helper)
 include(../../cmake/CommonSettings.cmake)
 set_common_settings()
 
-add_library(cmd_helper INTERFACE)
+add_library(cmd_helper src/cmdHelper.cpp)
 
-target_include_directories(cmd_helper INTERFACE include)
+target_include_directories(cmd_helper PUBLIC include)
 
-target_link_libraries(cmd_helper INTERFACE pal)
+target_link_libraries(cmd_helper PRIVATE deleter_helper)
+
+include(../../cmake/ConfigureTarget.cmake)
+configure_target(cmd_helper)
 
 if(BUILD_TESTS)
     enable_testing()

src/common/cmdHelper/include/cmdHelper.hpp

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <string>
+
+namespace Utils
+{
+    /// @brief Executes a command
+    /// @param cmd command
+    /// @param bufferSize buffer size in bytes
+    /// @return command output
+    std::string Exec(const std::string& cmd, const size_t bufferSize = 128);
+} // namespace Utils

src/common/cmdHelper/src/cmdHelper.cpp

@@ -0,0 +1,27 @@
+#include "cmdHelper.hpp"
+
+#include "fileSmartDeleter.hpp"
+#include <cstdio>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace Utils
+{
+    std::string Exec(const std::string& cmd, const size_t bufferSize)
+    {
+        const std::unique_ptr<FILE, FileSmartDeleter> file {popen(cmd.c_str(), "r")};
+        std::vector<char> buffer(bufferSize);
+        std::string result;
+
+        if (file)
+        {
+            while (fgets(buffer.data(), static_cast<int>(bufferSize), file.get()))
+            {
+                result += buffer.data();
+            }
+        }
+
+        return result;
+    }
+} // namespace Utils

src/common/cmdHelper/tests/CMakeLists.txt

@@ -9,7 +9,6 @@ add_executable(cmd_helper_tests
     ${UTIL_CXX_UNITTEST_COMMON_SRC}
 )
 
-include(../../../cmake/ConfigureTarget.cmake)
 configure_target(cmd_helper_tests)
 
 target_include_directories(cmd_helper_tests PRIVATE

src/common/cmdHelper/tests/cmdHelper_test.cpp

@@ -1,30 +1,19 @@
-/*
- * Wazuh shared modules utils
- * Copyright (C) 2015, Wazuh Inc.
- * October 19, 2020.
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General Public
- * License (version 2) as published by the FSF - Free Software
- * Foundation.
- */
-
-#include "cmdHelper_test.h"
-#include "cmdHelper.h"
+#include "cmdHelper_test.hpp"
+#include "cmdHelper.hpp"
 
 void CmdUtilsTest::SetUp() {};
 
 void CmdUtilsTest::TearDown() {};
 #ifdef WIN32
 TEST_F(CmdUtilsTest, CmdVersion)
 {
-    const auto result{Utils::exec("ver")};
+    const auto result {Utils::Exec("ver")};
     EXPECT_FALSE(result.empty());
 }
 #else
 TEST_F(CmdUtilsTest, CmdUname)
 {
-    const auto result{Utils::exec("uname")};
+    const auto result {Utils::Exec("uname")};
     EXPECT_FALSE(result.empty());
 }
 #endif