Cosmetics: address cppcheck warnings

Author: zimmerle

Makefile.am

@@ -56,15 +56,17 @@ parser:
 
 
 cppcheck:
-	@cppcheck -U YYSTYPE \
-                --suppressions-list=./test/cppcheck_suppressions.txt \
-                --enable=all \
-                --inconclusive \
-                --template="warning: {file},{line},{severity},{id},{message}" \
-                -I headers -I . -I others -I src -I others/mbedtls -I src/parser \
-                --error-exitcode=0 \
-                -i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
-                .
+	@cppcheck -U YYSTYPE -U MBEDTLS_MD5_ALT -U MBEDTLS_SHA1_ALT \
+		-D MS_CPPCHECK_DISABLED_FOR_PARSER \
+		--suppressions-list=./test/cppcheck_suppressions.txt \
+		--enable=all \
+		--inconclusive \
+		--template="warning: {file},{line},{severity},{id},{message}" \
+		-I headers -I . -I others -I src -I others/mbedtls -I src/parser \
+		--error-exitcode=1 \
+		-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
+		--force --verbose .
+
 
 check-static: cppcheck
 

build/lua.m4

@@ -6,7 +6,7 @@ AC_DEFUN([CHECK_LUA],
 [dnl
 
 # Possible names for the lua library/package (pkg-config)
-LUA_POSSIBLE_LIB_NAMES="luajit luajit-5.1 lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 lua"
+LUA_POSSIBLE_LIB_NAMES="lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 lua"
 
 # Possible extensions for the library
 LUA_POSSIBLE_EXTENSIONS="so so0 la sl dll dylib so.0.0.0"

examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h

@@ -115,7 +115,7 @@ class ReadingLogsViaRuleMessage {
         char *response_headers,
         char *response_body,
         char *ip,
-        std::string rules) :
+        const std::string &rules) :
             m_request_header(request_header),
             m_request_uri(request_uri),
             m_request_body(request_body),
@@ -133,7 +133,6 @@ class ReadingLogsViaRuleMessage {
 
         modsecurity::ModSecurity *modsec;
         modsecurity::Rules *rules;
-        modsecurity::ModSecurityIntervention it;
 
         modsec = new modsecurity::ModSecurity();
         modsec->setConnectorInformation("ModSecurity-test v0.0.1-alpha" \
@@ -168,8 +167,6 @@ class ReadingLogsViaRuleMessage {
         delete modsec;
         pthread_exit(NULL);
         return 0;
-end:
-        return -1;
     }
 
     static void logCb(void *data, const void *ruleMessagev) {

examples/using_bodies_in_chunks/simple_request.cc

@@ -126,7 +126,6 @@ int process_intervention(modsecurity::Transaction *transaction) {
 int main(int argc, char **argv) {
     modsecurity::ModSecurity *modsec;
     modsecurity::Rules *rules;
-    modsecurity::ModSecurityIntervention it;
 
     if (argc < 2) {
         std::cout << "Use " << *argv << " test-case-file.conf";

headers/modsecurity/anchored_set_variable.h

@@ -71,7 +71,7 @@ struct MyHash{
 class AnchoredSetVariable : public std::unordered_multimap<std::string,
 	VariableValue *, MyHash, MyEqual> {
  public:
-    AnchoredSetVariable(Transaction *t, std::string name);
+    AnchoredSetVariable(Transaction *t, const std::string &name);
     ~AnchoredSetVariable();
 
     void unset();

headers/modsecurity/anchored_variable.h

@@ -42,15 +42,18 @@ class Transaction;
 
 class AnchoredVariable {
  public:
-    AnchoredVariable(Transaction* t, std::string name);
-
-    AnchoredVariable(const AnchoredVariable &a) {
-        m_transaction = a.m_transaction;
-        m_offset = a.m_offset;
-        m_name = a.m_name;
-        m_value = a.m_value;
-        m_var = a.m_var;
-    }
+    AnchoredVariable(Transaction* t, const std::string &name);
+
+    AnchoredVariable(const AnchoredVariable &a) = delete;
+    AnchoredVariable &operator= (const AnchoredVariable &a) = delete;
+
+    /*
+        : m_transaction(a.m_transaction),
+        m_offset(a.m_offset),
+        m_name(a.m_name),
+        m_value(a.m_value),
+        m_var(a.m_var) { }
+    */
 
     ~AnchoredVariable();
 

headers/modsecurity/audit_log.h

@@ -37,7 +37,9 @@ class Writer;
 class AuditLog {
  public:
     AuditLog();
-    ~AuditLog();
+    virtual ~AuditLog();
+
+    AuditLog(const AuditLog &a) = delete;
 
     enum AuditLogType {
      NotSetAuditLogType,
@@ -158,22 +160,22 @@ class AuditLog {
     bool setStorageDir(const std::basic_string<char>& path);
     bool setFormat(AuditLogFormat fmt);
 
-    int getDirectoryPermission();
-    int getFilePermission();
-    int getParts();
+    int getDirectoryPermission() const;
+    int getFilePermission() const;
+    int getParts() const;
 
     bool setParts(const std::basic_string<char>& new_parts);
     bool setType(AuditLogType audit_type);
 
     bool init(std::string *error);
-    bool close();
+    virtual bool close();
 
     bool saveIfRelevant(Transaction *transaction);
     bool saveIfRelevant(Transaction *transaction, int parts);
     bool isRelevant(int status);
 
-    int addParts(int parts, const std::string& new_parts);
-    int removeParts(int parts, const std::string& new_parts);
+    static int addParts(int parts, const std::string& new_parts);
+    static int removeParts(int parts, const std::string& new_parts);
 
     bool merge(AuditLog *from, std::string *error);
 

headers/modsecurity/collection/collection.h

@@ -44,7 +44,7 @@ namespace collection {
 
 class Collection {
  public:
-    explicit Collection(std::string a) : m_name(a) { }
+    explicit Collection(const std::string &a) : m_name(a) { }
     virtual ~Collection() { }
     virtual void store(std::string key, std::string value) = 0;
 

headers/modsecurity/collection/collections.h

@@ -49,6 +49,9 @@ class Collections {
         Collection *user, Collection *resource);
     ~Collections();
 
+    Collections(const Collections &c) = delete;
+    Collections& operator =(const Collections &c) = delete;
+
     std::string m_global_collection_key;
     std::string m_ip_collection_key;
     std::string m_session_collection_key;

headers/modsecurity/debug_log.h

@@ -43,11 +43,11 @@ class DebugLog {
     virtual void write(int level, const std::string &msg);
     virtual void write(int level, const std::string &id,
         const std::string &uri, const std::string &msg);
-    bool isLogFileSet();
-    bool isLogLevelSet();
-    void setDebugLogLevel(int level);
-    void setDebugLogFile(const std::string &fileName, std::string *error);
-    const std::string& getDebugLogFile();
+    virtual bool isLogFileSet();
+    virtual bool isLogLevelSet();
+    virtual void setDebugLogLevel(int level);
+    virtual void setDebugLogFile(const std::string &fileName, std::string *error);
+    virtual const std::string& getDebugLogFile();
     virtual int getDebugLogLevel();
 
     int m_debugLevel;