Merge pull request #74 from Easton97-Jens/codex/systematische-behebung-offener-sonar-probleme-7954xf

Modernize codebase: nullptr/default initializers, std::string_view, smart pointers and minor cleanups

Author: Easton97-Jens

headers/modsecurity/audit_log.h

@@ -17,6 +17,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <string_view>
 #endif
 
 #ifndef HEADERS_MODSECURITY_AUDIT_LOG_H_

headers/modsecurity/rules_set_phases.h

@@ -20,6 +20,7 @@
 #ifdef __cplusplus
 #include <ctime>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 #include <list>
@@ -60,4 +61,4 @@ class RulesSetPhases {
 }  // namespace modsecurity
 #endif
 
-#endif  // HEADERS_MODSECURITY_RULES_SET_PHASES_H_
+#endif  // HEADERS_MODSECURITY_RULES_SET_PHASES_H_

headers/modsecurity/rules_set_properties.h

@@ -25,6 +25,7 @@
 #ifdef __cplusplus
 #include <ctime>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 #include <list>

src/actions/ctl/rule_remove_by_id.h

@@ -13,7 +13,9 @@
  *
  */
 
+#include <list>
 #include <string>
+#include <utility>
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"

src/anchored_set_variable.cc

@@ -16,6 +16,7 @@
 #include <ctime>
 #include <iostream>
 #include <fstream>
+#include <memory>
 #include <string>
 #include <vector>
 

src/anchored_variable.cc

@@ -16,6 +16,7 @@
 #include <ctime>
 #include <iostream>
 #include <fstream>
+#include <memory>
 #include <string>
 #include <vector>
 

src/audit_log/audit_log.cc

@@ -20,6 +20,7 @@
 #include <ctype.h>
 
 #include <fstream>
+#include <string_view>
 
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule_message.h"

src/operators/pm_from_file.cc

@@ -15,6 +15,7 @@
 
 #include "src/operators/pm_from_file.h"
 
+#include <memory>
 #include <string>
 
 #include "src/operators/operator.h"

src/operators/validate_byte_range.cc

@@ -15,6 +15,7 @@
 
 #include "src/operators/validate_byte_range.h"
 
+#include <array>
 #include <cctype>
 #include <cstring>
 #include <string>

src/request_body_processor/json.cc

@@ -20,18 +20,21 @@
 #include "src/request_body_processor/json.h"
 
 #include <chrono>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <string>
 
+#include "modsecurity/transaction.h"
 #include "src/request_body_processor/json_adapter.h"
 #include "src/request_body_processor/json_instrumentation.h"
 
 
 namespace modsecurity::RequestBodyProcessor {
 
 static const double json_depth_limit_default = 10000.0;
-static const char* json_depth_limit_exceeded_msg = ". Parsing depth limit exceeded";
+static const char *const json_depth_limit_exceeded_msg =
+    ". Parsing depth limit exceeded";
 
 namespace {
 
@@ -119,11 +122,7 @@ JsonSinkStatus addStringViewAsSinkStatus(JSON *json, std::string_view value) {
 }  // namespace
 
 JSON::JSON(Transaction *transaction) : m_transaction(transaction),
-    m_current_key(""),
-    m_data(""),
-    m_max_depth(json_depth_limit_default),
-    m_current_depth(0),
-    m_depth_limit_exceeded(false) {
+    m_max_depth(json_depth_limit_default) {
 }
 
 
@@ -185,11 +184,11 @@ bool JSON::complete(std::string *err) {
 
 
 int JSON::addArgument(const std::string& value) {
-    std::string data("");
+    std::string data;
     std::string path;
 
-    for (size_t i =  0; i < m_containers.size(); i++) {
-        const JSONContainerArray *a = dynamic_cast<JSONContainerArray *>(
+    for (size_t i = 0; i < m_containers.size(); i++) {
+        const auto *a = dynamic_cast<JSONContainerArray *>(
             m_containers[i].get());
         path = path + m_containers[i]->m_name;
         if (a != nullptr) {
@@ -199,8 +198,8 @@ int JSON::addArgument(const std::string& value) {
         }
     }
 
-    if (m_containers.size() > 0) {
-        JSONContainerArray *a = dynamic_cast<JSONContainerArray *>(
+    if (!m_containers.empty()) {
+        auto *a = dynamic_cast<JSONContainerArray *>(
             m_containers.back().get());
         if (a) {
             a->m_elementCounter++;