Adds support to config warnings

Author: zimmerle

Makefile.am

@@ -127,6 +127,7 @@ TESTS+=test/test-cases/regression/config-body_limits.json
 TESTS+=test/test-cases/regression/config-calling_phases_by_name.json
 TESTS+=test/test-cases/regression/config-include-bad.json
 TESTS+=test/test-cases/regression/config-include.json
+TESTS+=test/test-cases/regression/config-warning.json
 TESTS+=test/test-cases/regression/config-remove_by_id.json
 TESTS+=test/test-cases/regression/config-remove_by_msg.json
 TESTS+=test/test-cases/regression/config-remove_by_tag.json

examples/multiprocess_c/multi.c

@@ -97,6 +97,7 @@ int main (int argc, char **argv)
 {
     int ret;
     const char *error = NULL;
+    const char *warn = NULL;
     int i = 0;
     pid_t pid;
     int f;
@@ -108,7 +109,7 @@ int main (int argc, char **argv)
 
     rules = msc_create_rules_set();
 
-    ret = msc_rules_add_file(rules, main_rule_uri, &error);
+    ret = msc_rules_add_file(rules, main_rule_uri, &warn, &error);
     if (ret < 0) {
         fprintf(stderr, "Problems loading the rules --\n");
         fprintf(stderr, "%s\n", error);

examples/simple_example_using_c/test.c

@@ -27,6 +27,7 @@ int main (int argc, char **argv)
 {
     int ret;
     const char *error = NULL;
+    const char *warn = NULL;
     ModSecurity *modsec;
     Transaction *transaction = NULL;
     RulesSet *rules;
@@ -38,7 +39,7 @@ int main (int argc, char **argv)
 
     rules = msc_create_rules_set();
 
-    ret = msc_rules_add_file(rules, main_rule_uri, &error);
+    ret = msc_rules_add_file(rules, main_rule_uri, &warn, &error);
     if (ret < 0) {
         fprintf(stderr, "Problems loading the rules --\n");
         fprintf(stderr, "%s\n", error);
@@ -48,7 +49,7 @@ int main (int argc, char **argv)
 
     ret = msc_rules_add_remote(rules, "test",
         "https://www.modsecurity.org/modsecurity-regression-test-secremoterules.txt",
-        &error);
+        &warn, &error);
     if (ret < 0) {
         fprintf(stderr, "Problems loading the rules --\n");
         fprintf(stderr, "%s\n", error);

headers/modsecurity/actions/action.h

@@ -120,6 +120,19 @@ class Action {
     }
 };
 
+class ActionNotSupported : public Action {
+ public:
+    ActionNotSupported() : Action()
+    { };
+
+    explicit ActionNotSupported(const std::string& action)
+        : Action(action)
+    { };
+
+    ActionNotSupported(const ActionNotSupported &other) = delete;
+    ActionNotSupported &operator=(const ActionNotSupported& a) = delete;
+};
+
 
 }  // namespace actions
 }  // namespace modsecurity

headers/modsecurity/rules_set.h

@@ -75,6 +75,7 @@ class RulesSet : public RulesSetProperties {
     int evaluate(int phase, Transaction *transaction);
 
     std::string getParserError();
+    std::string getParserWarnings();
 
     void debug(int level, const std::string &id, const std::string &uri,
         const std::string &msg);
@@ -95,11 +96,14 @@ extern "C" {
 
 RulesSet *msc_create_rules_set(void);
 void msc_rules_dump(RulesSet *rules);
-int msc_rules_merge(RulesSet *rules_dst, RulesSet *rules_from, const char **error);
+int msc_rules_merge(RulesSet *rules_dst, RulesSet *rules_from,
+    const char **warn, const char **error);
 int msc_rules_add_remote(RulesSet *rules, const char *key, const char *uri,
-    const char **error);
-int msc_rules_add_file(RulesSet *rules, const char *file, const char **error);
-int msc_rules_add(RulesSet *rules, const char *plain_rules, const char **error);
+    const char **warn, const char **error);
+int msc_rules_add_file(RulesSet *rules, const char *file,
+    const char **warn, const char **error);
+int msc_rules_add(RulesSet *rules, const char *plain_rules,
+    const char **warn, const char **error);
 int msc_rules_cleanup(RulesSet *rules);
 
 #ifdef __cplusplus

headers/modsecurity/rules_set_properties.h

@@ -457,6 +457,7 @@ class RulesSetProperties {
     RulesExceptions m_exceptions;
     std::list<std::string> m_components;
     std::ostringstream m_parserError;
+    std::ostringstream m_parserWarn;
     ConfigSet m_responseBodyTypeToBeInspected;
     ConfigString m_httpblKey;
     ConfigString m_uploadDirectory;

src/parser/driver.cc

@@ -180,7 +180,7 @@ int Driver::addSecRule(std::unique_ptr<RuleWithActions> r) {
      */
     if (rule->getId() == 0) {
         m_parserError << "Rules must have an ID. File: ";
-        m_parserError << rule->getFileName() << " at line: ";
+        m_parserError << *rule->getFileName() << " at line: ";
         m_parserError << std::to_string(rule->getLineNumber()) << std::endl;
         return false;
     }
@@ -282,5 +282,30 @@ void Driver::error(const yy::location& l, const std::string& m,
 }
 
 
+void Driver::warn(const yy::location& l, const std::string& m) {
+    warn(l, m, "");
+}
+
+
+void Driver::warn(const yy::location& l, const std::string& m,
+    const std::string& c) {
+    if (m_parserWarn.tellp() != 0) {
+        m_parserWarn << std::endl;
+    }
+    m_parserWarn << "Warning. ";
+    m_parserWarn << "File: " << *l.end.filename << ". ";
+    m_parserWarn << "Line: " << l.end.line << ". ";
+    m_parserWarn << "Column: " << l.end.column - 1 << ". ";
+
+    if (m.empty() == false) {
+        m_parserWarn << "" << m << " ";
+    }
+
+    if (c.empty() == false) {
+        m_parserWarn << c;
+    }
+}
+
+
 }  // namespace Parser
 }  // namespace modsecurity

src/parser/driver.h

@@ -86,6 +86,10 @@ class Driver : public RulesSetProperties {
     void error(const yy::location& l, const std::string& m,
         const std::string& c);
 
+    void warn(const yy::location& l, const std::string& m);
+    void warn(const yy::location& l, const std::string& m,
+        const std::string& c);
+
     std::list<yy::location *> loc;
 
     std::string buffer;