From 1a0b9721f872404387cf4a9f7b1f9e8eaed54285 Mon Sep 17 00:00:00 2001 From: Alexandre Rulleau Date: Tue, 19 Nov 2024 13:43:36 +0100 Subject: [PATCH] test: apply reviewer suggestions Signed-off-by: Alexandre Rulleau --- appsec/tests/helper/client_test.cpp | 21 +++++++++---------- .../appsec/php/integration/CommonTests.groovy | 10 ++++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/appsec/tests/helper/client_test.cpp b/appsec/tests/helper/client_test.cpp index 8dd0f8fb2f..c69002f9ff 100644 --- a/appsec/tests/helper/client_test.cpp +++ b/appsec/tests/helper/client_test.cpp @@ -1764,7 +1764,7 @@ TEST(ClientTest, RequestExecWithAttack) } } -TEST(ClientTest, RequestShutdownWithAttackAndFingerprint) +TEST(ClientTest, RequestShutdownWithWithAttackAndFingerprint) { auto smanager = std::make_shared(); auto broker = new mock::broker(); @@ -1776,14 +1776,7 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint) // Request Init { network::request_init::request msg; - - auto query = parameter::map(); - query.add("query", parameter::string("asdfds"sv)); - msg.data = parameter::map(); - msg.data.add("server.request.uri.raw", parameter::string("asdfds"sv)); - msg.data.add("server.request.method", parameter::string("GET"sv)); - msg.data.add("server.request.query", std::move(query)); network::request req(std::move(msg)); @@ -1804,8 +1797,15 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint) // Request Shutdown { network::request_shutdown::request msg; + + auto query = parameter::map(); + query.add("query", parameter::string("asdfds"sv)); + msg.data = parameter::map(); msg.data.add("http.client_ip", parameter::string("192.168.1.1"sv)); + msg.data.add("server.request.uri.raw", parameter::string("asdfds"sv)); + msg.data.add("server.request.method", parameter::string("GET"sv)); + msg.data.add("server.request.query", std::move(query)); network::request req(std::move(msg)); @@ -1820,10 +1820,9 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint) auto msg_res = dynamic_cast(res.get()); EXPECT_STREQ(msg_res->actions[0].verdict.c_str(), "block"); - EXPECT_FALSE(std::regex_match( + EXPECT_TRUE(std::regex_match( msg_res->meta["_dd.appsec.fp.http.endpoint"].c_str(), - std::regex( - "http-get-[A-Za-z0-9]{8}-[A-Za-z0-9]{8}-([A-Za-z0-9]{8})?"))); + std::regex("\"http-get(-[A-Za-z0-9]*){2,3}\""))); } } diff --git a/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy b/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy index 70b4587714..6a572c7453 100644 --- a/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy +++ b/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy @@ -222,7 +222,7 @@ trait CommonTests { assert span.metrics."_dd.appsec.enabled" == 1.0d assert span.metrics."_dd.appsec.waf.duration" > 0.0d assert span.meta."_dd.appsec.event_rules.version" != '' - assert span.meta."_dd.appsec.fp.http.endpoint" != '' + assert span.meta."_dd.appsec.fp.http.endpoint" ==~ /^"http-get(-[a-zA-Z0-9]*){3,4}"$/ } @Test @@ -237,7 +237,7 @@ trait CommonTests { assert span.metrics."_dd.appsec.enabled" == 1.0d assert span.metrics."_dd.appsec.waf.duration" > 0.0d assert span.meta."_dd.appsec.event_rules.version" != '' - assert span.meta."_dd.appsec.fp.http.endpoint" != '' + assert span.meta."_dd.appsec.fp.http.endpoint" ==~ /^"http-get(-[a-zA-Z0-9]*){3,4}"$/ } @Test @@ -251,7 +251,7 @@ trait CommonTests { assert span.metrics."_dd.appsec.enabled" == 1.0d assert span.metrics."_dd.appsec.waf.duration" > 0.0d assert span.meta."_dd.appsec.event_rules.version" != '' - assert span.meta."_dd.appsec.fp.http.endpoint" != '' + assert span.meta."_dd.appsec.fp.http.endpoint" ==~ /^"http-get(-[a-zA-Z0-9]*){3,4}"$/ } @Test @@ -265,7 +265,7 @@ trait CommonTests { assert span.metrics."_dd.appsec.enabled" == 1.0d assert span.metrics."_dd.appsec.waf.duration" > 0.0d assert span.meta."_dd.appsec.event_rules.version" != '' - assert span.meta."_dd.appsec.fp.http.endpoint" != '' + assert span.meta."_dd.appsec.fp.http.endpoint" ==~ /^"http-get(-[a-zA-Z0-9]*){3,4}"$/ } @Test @@ -282,7 +282,7 @@ trait CommonTests { assert span.metrics."_dd.appsec.waf.duration" > 0.0d assert span.meta."_dd.appsec.event_rules.version" != '' assert span.meta."appsec.blocked" == "true" - assert span.meta."_dd.appsec.fp.http.endpoint" != '' + assert span.meta."_dd.appsec.fp.http.endpoint" ==~ /^"http-get(-[a-zA-Z0-9]*){3,4}"$/ } @Test