Adds support to the server ID generation

The server ID is a sha-1 identifier generated from the mac address of the first ethernet device plus the server name. The process is the same used by ModSecurity 2.9
2025-09-29 19:24:29 +03:00 · 2015-07-07 15:38:21 -03:00
parent aadbacf854
commit 2109910848
19 changed files with 813 additions and 38 deletions
--- a/test/benchmark/benchmark.cc
+++ b/test/benchmark/benchmark.cc
@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) {
        std::cout << "Proceding with request " << i << std::endl;

        Assay *modsecAssay = new Assay(modsec, rules);
-        modsecAssay->processConnection(ip);
+        modsecAssay->processConnection(ip, 12345, "127.0.0.1", 80);

        if (modsecAssay->intervention()) {
            std::cout << "There is an intervention" << std::endl;
--- a/test/regression/regression.cc
+++ b/test/regression/regression.cc
@@ -78,13 +78,12 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
        }
        modsec_assay = new ModSecurity::Assay(modsec, modsec_rules);

-        if (t->ip.empty() == false) {
-            // FIXME: no cast please.
-            modsec_assay->processConnection(t->ip.c_str());
-            actions(&r, modsec_assay->intervention());
-            if (r.status != 200) {
-                goto end;
-            }
+        modsec_assay->processConnection(t->clientIp.c_str(),
+            t->clientPort, t->serverIp.c_str(), t->serverPort);
+
+        actions(&r, modsec_assay->intervention());
+        if (r.status != 200) {
+             goto end;
        }
        if (t->uri.empty() == false) {
            modsec_assay->processURI(t->uri.c_str());
--- a/test/regression/regression_test.cc
+++ b/test/regression/regression_test.cc
@@ -107,6 +107,32 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) {
        if (strcmp(key, "github_issue") == 0) {
            u->github_issue = YAJL_GET_INTEGER(val);
        }
+        if (strcmp(key, "client") == 0) {
+            for (int j = 0; j < val->u.object.len; j++) {
+                const char *key2 = val->u.object.keys[j];
+                yajl_val val2 = val->u.object.values[j];
+
+                if (strcmp(key2, "ip") == 0) {
+                    u->clientIp = YAJL_GET_STRING(val2);
+                }
+                if (strcmp(key2, "port") == 0) {
+                    u->clientPort = YAJL_GET_INTEGER(val2);
+                }
+            }
+        }
+        if (strcmp(key, "server") == 0) {
+            for (int j = 0; j < val->u.object.len; j++) {
+                const char *key2 = val->u.object.keys[j];
+                yajl_val val2 = val->u.object.values[j];
+
+                if (strcmp(key2, "ip") == 0) {
+                    u->serverIp = YAJL_GET_STRING(val2);
+                }
+                if (strcmp(key2, "port") == 0) {
+                    u->serverPort = YAJL_GET_INTEGER(val2);
+                }
+            }
+        }
        if (strcmp(key, "request") == 0) {
            for (int j = 0; j < val->u.object.len; j++) {
                const char *key2 = val->u.object.keys[j];
@@ -115,9 +141,6 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) {
                if (strcmp(key2, "uri") == 0) {
                   u->uri = YAJL_GET_STRING(val2);
                }
-                if (strcmp(key2, "ip") == 0) {
-                   u->ip = YAJL_GET_STRING(val2);
-                }
                if (strcmp(key2, "headers") == 0) {
                    u->request_headers = yajl_array_to_map(val2);
                }
--- a/test/regression/regression_test.h
+++ b/test/regression/regression_test.h
@@ -51,7 +51,11 @@ class RegressionTest {
    std::string debug_log;
    std::string error_log;

-    std::string ip;
+    std::string clientIp;
+    std::string serverIp;
+    int clientPort;
+    int serverPort;
+
    std::string uri;

    static inline std::string yajl_array_to_str(const yajl_val &node);
--- a/test/test-cases/regression/actions.json
+++ b/test/test-cases/regression/actions.json
@@ -4,8 +4,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: trim,block",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -56,8 +63,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: trim,redirect:http://www.google.com",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -109,8 +123,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: trim,status:500,redirect:http://www.google.com",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -162,8 +183,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: trim,status:500",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -214,8 +242,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: phase:1,trim,status:500",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -266,8 +301,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "actions :: phase:4,trim,status:500",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
--- a/test/test-cases/regression/auditlog.json
+++ b/test/test-cases/regression/auditlog.json
@@ -4,8 +4,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "auditlog : basic parser test",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "www.modsecurity.org",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
--- a/test/test-cases/regression/debug_log.json
+++ b/test/test-cases/regression/debug_log.json
@@ -4,8 +4,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "Debug log",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
--- a/test/test-cases/regression/issue-394.json
+++ b/test/test-cases/regression/issue-394.json
@@ -6,6 +6,14 @@
  "title": "Segmentation fault when uploading file with SecStreamInBodyInspection enabled",
  "url": "https:\/\/github.com\/SpiderLabs\/ModSecurity\/issues\/394",
  "gihub_issue": 394,
+  "client": {
+    "ip": "200.249.12.31",
+    "port": 2313
+  },
+  "server": {
+    "ip": "200.249.12.31",
+    "port": 80
+  },
  "request": {
    "headers": "",
    "body": ""
--- a/test/test-cases/regression/transformations.json
+++ b/test/test-cases/regression/transformations.json
@@ -4,8 +4,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "Testing transformations :: pass,t:trim",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",
@@ -55,8 +62,15 @@
    "version_min": 300000,
    "version_max": 0,
    "title": "Testing transformations :: pass,t:trim,t:lowercase",
-    "request": {
+    "client": {
      "ip": "200.249.12.31",
+      "port": 2313
+    },
+    "server": {
+      "ip": "200.249.12.31",
+      "port": 80
+    },
+    "request": {
      "headers": {
        "Host": "net.tutsplus.com",
        "User-Agent": "Mozilla\/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko\/20091102 Firefox\/3.5.5 (.NET CLR 3.5.30729)",