Fix a few things to provide an easy interface for script bindings

src/Makefile.am

@@ -27,6 +27,7 @@ pkginclude_HEADERS = \
 	../headers/modsecurity/debug_log.h \
 	../headers/modsecurity/intervention.h \
 	../headers/modsecurity/modsecurity.h \
+	../headers/modsecurity/rule.h \
 	../headers/modsecurity/rules.h \
 	../headers/modsecurity/rules_properties.h
 

src/actions/action.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 
 #include "actions/block.h"
 #include "actions/chain.h"

src/actions/block.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "modsecurity/intervention.h"
 
 namespace modsecurity {

src/actions/capture.cc

@@ -21,7 +21,7 @@
 
 #include "modsecurity/assay.h"
 
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "operators/operator.h"
 #include "operators/pm.h"
 #include "operators/rx.h"

src/actions/chain.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/pass.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/phase.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "src/utils.h"
 #include "modsecurity/modsecurity.h"
 

src/actions/rev.cc

@@ -21,7 +21,7 @@
 #include "actions/action.h"
 #include "modsecurity/assay.h"
 #include "src/utils.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
 
 namespace modsecurity {

src/actions/rule_id.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/set_var.cc

@@ -19,7 +19,7 @@
 #include <string>
 
 #include "modsecurity/assay.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "src/macro_expansion.h"
 #include "src/utils.h"
 

src/modsecurity.cc

@@ -17,7 +17,7 @@
 #include <iostream>
 
 #include "modsecurity/modsecurity.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "src/config.h"
 #include "src/unique_id.h"
 #ifdef MSC_WITH_CURL
@@ -76,7 +76,7 @@ ModSecurity::~ModSecurity() {
  *       update it, make it in a fashion that won't break the existent parsers.
  *       (e.g. adding extra information _only_ to the end of the string)
  */
-std::string ModSecurity::whoAmI() {
+const std::string ModSecurity::whoAmI() {
     std::string platform("Unknown platform");
 
 #if AIX

src/parser/seclang-parser.yy

@@ -33,7 +33,7 @@ class Driver;
 #include "actions/transformations/transformation.h"
 #include "actions/transformations/none.h"
 #include "operators/operator.h"
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 #include "utils/geo_lookup.h"
 #include "audit_log.h"
 #include "utils.h"

src/rule.cc

@@ -13,7 +13,7 @@
  *
  */
 
-#include "src/rule.h"
+#include "modsecurity/rule.h"
 
 #include <stdio.h>
 
@@ -135,6 +135,25 @@ Rule::Rule(Operator *_op,
 }
 
 
+std::vector<std::string> Rule::getActionNames() {
+    std::vector<std::string> a;
+    for (auto &z : this->actions_runtime_pos)
+    {
+        a.push_back(z->action);
+    }
+    for (auto &z : this->actions_runtime_pre)
+    {
+        a.push_back(z->action);
+    }
+    for (auto &z : this->actions_conf)
+    {
+        a.push_back(z->action);
+    }
+
+    return a;
+}
+
+
 bool Rule::evaluateActions(Assay *assay) {
     int none = 0;
     bool containsDisruptive = false;

src/rule.h

@@ -1,86 +0,0 @@
-/*
- * ModSecurity, http://www.modsecurity.org/
- * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
- *
- * You may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * If any of the files related to licensing are missing or if you have any
- * other questions related to licensing please contact Trustwave Holdings, Inc.
- * directly using the email address security@modsecurity.org.
- *
- */
-
-#ifdef __cplusplus
-#include <stack>
-#include <vector>
-#include <string>
-#endif
-
-#ifndef SRC_RULE_H_
-#define SRC_RULE_H_
-
-#include "modsecurity/modsecurity.h"
-#include "variables/variable.h"
-
-#ifdef __cplusplus
-
-namespace modsecurity {
-
-class Rule {
- public:
-    Rule(operators::Operator *_op,
-            std::vector<Variables::Variable *> *_variables,
-            std::vector<actions::Action *> *_actions,
-            std::string fileName,
-            int lineNumber);
-    explicit Rule(std::string marker);
-
-    ~Rule();
-    bool evaluate(Assay *assay);
-    bool evaluateActions(Assay *assay);
-
-    operators::Operator *op;
-    std::vector<actions::Action *> actions_conf;
-    std::vector<actions::Action *> actions_runtime_pre;
-    std::vector<actions::Action *> actions_runtime_pos;
-
-    std::vector<Variables::Variable *> *variables;
-    int phase;
-    long rule_id;
-
-    Rule *chainedRule;
-    bool chained;
-
-    void refCountDecreaseAndCheck() {
-        this->m_referenceCount--;
-        if (this->m_referenceCount == 0) {
-            delete this;
-        }
-    }
-
-    void refCountIncrease() {
-        this->m_referenceCount++;
-    }
-
-    std::string rev;
-
-    std::string m_marker;
-    bool m_secmarker;
-    std::string m_fileName;
-    int m_lineNumber;
-
- private:
-    bool m_unconditional;
-    int m_referenceCount;
-};
-
-}  // namespace modsecurity
-#endif
-
-
-#endif  // SRC_RULE_H_
-
-