Coding style fixes

Author: Felipe Zimmerle

examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h

@@ -13,10 +13,11 @@
  *
  */
 
+#include <unistd.h>
+
 #include <string>
 #include <memory>
 
-#include <unistd.h>
 
 #define NUM_THREADS 100
 
@@ -151,8 +152,9 @@ class ReadingLogsViaRuleMessage {
         dms.rules = rules;
 
         for (i = 0; i < NUM_THREADS; i++) {
-            pthread_create(&threads[i], NULL, process_request, (void *)&dms);
-            //process_request((void *)&dms);
+            pthread_create(&threads[i], NULL, process_request,
+		reinterpret_cast<void *>(&dms));
+            //  process_request((void *)&dms);
         }
 
         usleep(10000);

examples/reading_logs_via_rule_message/simple_request.cc

@@ -23,14 +23,13 @@
 
 
 int main(int argc, char **argv) {
-    *argv++;
-    if (*argv == NULL) {
-        *argv--;
+    if (argc < 2) {
         std::cout << "Use " << *argv << " test-case-file.conf";
         std::cout << std::endl << std::endl;
         return -1;
     }
 
+    *(argv++);
     std::string rules(*argv);
     ReadingLogsViaRuleMessage rlvrm(request_header, request_uri, request_body,
         response_headers, response_body, ip, rules);

examples/simple_example_using_c/basic_rules.conf

@@ -35,14 +35,11 @@ SecRule REQUEST_HEADERS:Content-Type "application/json" \
 # to the size of data, with files excluded. You want to keep that value as
 # low as practical.
 #
-SecRequestBodyLimit 13107200
-SecRequestBodyNoFilesLimit 131072
 
 # Store up to 128 KB of request body data in memory. When the multipart
 # parser reachers this limit, it will start using your hard disk for
 # storage. That is slow, but unavoidable.
 #
-SecRequestBodyInMemoryLimit 131072
 
 # What do do if the request body size is above our configured limit.
 # Keep in mind that this setting will automatically be set to ProcessPartial

examples/using_bodies_in_chunks/simple_request.cc

@@ -13,18 +13,20 @@
  *
  */
 
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#include <string>
-#include <memory>
 
-#include <unistd.h>
 
 #include <modsecurity/modsecurity.h>
 #include <modsecurity/rules.h>
 #include <modsecurity/rule_message.h>
 
 
+#include <string>
+#include <memory>
+
+
 
 char request_uri[] = "/test.pl?param1=test&para2=test2";
 
@@ -85,8 +87,7 @@ static void logCb(void *data, const void *ruleMessagev) {
     }
 }
 
-int process_intervention(modsecurity::Transaction *transaction)
-{
+int process_intervention(modsecurity::Transaction *transaction) {
     modsecurity::ModSecurityIntervention intervention;
     intervention.status = 200;
     intervention.url = NULL;
@@ -105,17 +106,15 @@ int process_intervention(modsecurity::Transaction *transaction)
     free(intervention.log);
     intervention.log = NULL;
 
-    if (intervention.url != NULL)
-    {
+    if (intervention.url != NULL) {
         std::cout << "Intervention, redirect to: " << intervention.url;
         std::cout << " with status code: " << intervention.status << std::endl;
         free(intervention.url);
         intervention.url = NULL;
         return intervention.status;
     }
 
-    if (intervention.status != 200)
-    {
+    if (intervention.status != 200) {
         std::cout << "Intervention, returning code: " << intervention.status;
         std::cout << std::endl;
         return intervention.status;
@@ -129,13 +128,12 @@ int main(int argc, char **argv) {
     modsecurity::Rules *rules;
     modsecurity::ModSecurityIntervention it;
 
-    *argv++;
-    if (*argv == NULL) {
-        *argv--;
+    if (argc < 2) {
         std::cout << "Use " << *argv << " test-case-file.conf";
         std::cout << std::endl << std::endl;
         return -1;
     }
+    *(argv++);
 
     std::string rules_arg(*argv);
 

headers/modsecurity/audit_log.h

@@ -206,7 +206,7 @@ class AuditLog {
     int m_directoryPermission;
     int m_defaultDirectoryPermission = 0750;
 
-private:
+ private:
     AuditLogStatus m_status;
 
     AuditLogType m_type;

headers/modsecurity/collection/variable.h

@@ -19,6 +19,7 @@
 #include <iostream>
 #include <memory>
 #include <list>
+#include <utility>
 #endif
 
 #include "modsecurity/variable_origin.h"
@@ -51,7 +52,7 @@ class Variable {
         m_key(""),
         m_value("") { }
 
-    Variable(const Variable *o) :
+    explicit Variable(const Variable *o) :
         m_key(""),
         m_value("") {
         m_key.assign(o->m_key);

headers/modsecurity/rule.h

@@ -52,7 +52,8 @@ class Rule {
     explicit Rule(std::string marker);
     ~Rule();
 
-    virtual bool evaluate(Transaction *transaction, std::shared_ptr<RuleMessage> rm);
+    virtual bool evaluate(Transaction *transaction,
+        std::shared_ptr<RuleMessage> rm);
     bool evaluateActions(Transaction *transaction);
     std::vector<std::unique_ptr<collection::Variable>>
 	getFinalVars(Transaction *trasn);
@@ -108,7 +109,7 @@ class Rule {
     operators::Operator *m_op;
     int m_phase;
     std::string m_rev;
-    long m_ruleId;
+    int64_t m_ruleId;
     bool m_secMarker;
     std::vector<Variables::Variable *> *m_variables;
     std::string m_ver;

headers/modsecurity/rule_message.h

@@ -76,7 +76,8 @@ class RuleMessage {
         return RuleMessage::log(this, props, responseCode);
     }
     std::string errorLog() {
-        return RuleMessage::log(this, ClientLogMessageInfo | ErrorLogTailLogMessageInfo);
+        return RuleMessage::log(this,
+		ClientLogMessageInfo | ErrorLogTailLogMessageInfo);
     }
 
     static std::string log(const RuleMessage *rm, int props, int code);

headers/modsecurity/rules_exceptions.h

@@ -48,26 +48,29 @@ class RulesExceptions {
     bool addRange(int a, int b);
     bool addNumber(int a);
     bool contains(int a);
-    bool merge(RulesExceptions& from);
+    bool merge(RulesExceptions *from);
 
     bool loadRemoveRuleByMsg(const std::string &msg, std::string *error);
     bool loadRemoveRuleByTag(const std::string &msg, std::string *error);
 
     bool loadUpdateTargetByMsg(const std::string &msg,
-        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > var,
+        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
         std::string *error);
 
     bool loadUpdateTargetByTag(const std::string &tag,
-        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > var,
+        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
         std::string *error);
 
     bool loadUpdateTargetById(double id,
-        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > var,
+        std::unique_ptr<std::vector<std::unique_ptr<Variables::Variable> > > v,
         std::string *error);
 
-    std::unordered_multimap<std::shared_ptr<std::string>, std::unique_ptr<Variables::Variable>> m_variable_update_target_by_tag;
-    std::unordered_multimap<std::shared_ptr<std::string>, std::unique_ptr<Variables::Variable>> m_variable_update_target_by_msg;
-    std::unordered_multimap<double, std::unique_ptr<Variables::Variable>> m_variable_update_target_by_id;
+    std::unordered_multimap<std::shared_ptr<std::string>,
+	std::unique_ptr<Variables::Variable>> m_variable_update_target_by_tag;
+    std::unordered_multimap<std::shared_ptr<std::string>,
+	std::unique_ptr<Variables::Variable>> m_variable_update_target_by_msg;
+    std::unordered_multimap<double,
+	std::unique_ptr<Variables::Variable>> m_variable_update_target_by_id;
     std::list<std::string> m_remove_rule_by_msg;
     std::list<std::string> m_remove_rule_by_tag;
 

headers/modsecurity/rules_properties.h

@@ -355,7 +355,7 @@ class RulesProperties {
             to->m_httpblKey.m_set = from->m_httpblKey.m_set;
         }
 
-        to->m_exceptions.merge(from->m_exceptions);
+        to->m_exceptions.merge(&from->m_exceptions);
 
         to->m_components.insert(to->m_components.end(),
             from->m_components.begin(), from->m_components.end());