Upgrade libddwaf to v1.22.0 (#3007)

DataDog · Dec 19, 2024 · dc9911b · dc9911b
1 parent 0d57b55
commit dc9911b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/appsec/tests/helper/client_test.cpp b/appsec/tests/helper/client_test.cpp
@@ -2760,7 +2760,7 @@ TEST(ClientTest, RaspCalls)
             dynamic_cast<network::request_shutdown::response *>(res.get());
 
         EXPECT_EQ(msg_res->metrics.size(), 3);
-        EXPECT_GT(msg_res->metrics[metrics::waf_duration], 0.0);
+        EXPECT_GE(msg_res->metrics[metrics::waf_duration], 0.0);
         EXPECT_EQ(msg_res->metrics[metrics::rasp_rule_eval], 1);
         EXPECT_GE(msg_res->metrics[metrics::rasp_duration], 0.0);
     }

diff --git a/appsec/tests/helper/waf_test.cpp b/appsec/tests/helper/waf_test.cpp
@@ -117,8 +117,10 @@ TEST(WafTest, RunWithTimeout)
 
         EXPECT_CALL(submitm, submit_span_metric(metrics::rasp_timeout, 1));
         EXPECT_CALL(submitm, submit_span_metric(metrics::rasp_rule_eval, 1.0));
-        EXPECT_CALL(submitm, submit_span_metric(metrics::waf_duration, 0.0));
-        EXPECT_CALL(submitm, submit_span_metric(metrics::rasp_duration, 0.0));
+        // Since v1.22.0 libddwaf will still attempt to run denylists, which
+        // will cause the duration to be non-zero
+        EXPECT_CALL(submitm, submit_span_metric(metrics::waf_duration, _));
+        EXPECT_CALL(submitm, submit_span_metric(metrics::rasp_duration, _));
         parameter_view pv(p);
         dds::event e;
         bool is_rasp = true;

diff --git a/...c/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy b/...c/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy
@@ -181,7 +181,7 @@ trait CommonTests {
 
     @Test
     void 'test blocking and stack generation'() {
-        HttpRequest req = container.buildReq('/generate_stack.php?id=user2020').GET().build()
+        HttpRequest req = container.buildReq('/generate_stack.php?id=stack_user').GET().build()
         def trace = container.traceFromRequest(req, ofString()) { HttpResponse<String> re ->
             assert re.statusCode() == 403
             assert re.body().contains('blocked')

diff --git a/appsec/tests/integration/src/test/waf/recommended.json b/appsec/tests/integration/src/test/waf/recommended.json
@@ -44,7 +44,7 @@
                 "address": "usr.id"
               }
             ],
-            "data": "blocked_users"
+            "data": "blocked_users_with_stack"
           },
           "operator": "exact_match"
         }
@@ -6894,6 +6894,17 @@
         }
       ]
     },
+    {
+      "id": "blocked_users_with_stack",
+      "type": "data_with_expiration",
+      "data": [
+        {
+          "value": "stack_user",
+          "expiration": 0
+        }
+      ]
+    },
+
     {
       "id": "redirected_users",
       "type": "data_with_expiration",

diff --git a/appsec/third_party/libddwaf b/appsec/third_party/libddwaf