test: apply reviewer suggestions

Signed-off-by: Alexandre Rulleau <[email protected]>
DataDog · Nov 19, 2024 · 418effc · 418effc
1 parent 7e3a0f8
commit 418effc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git 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, RequestShutdownWithFingerprint)
 {
     auto smanager = std::make_shared<service_manager>();
     auto broker = new mock::broker();
@@ -1805,7 +1805,6 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint)
     {
         network::request_shutdown::request msg;
         msg.data = parameter::map();
-        msg.data.add("http.client_ip", parameter::string("192.168.1.1"sv));
 
         network::request req(std::move(msg));
 
@@ -1819,7 +1818,7 @@ TEST(ClientTest, RequestShutdownWithAttackAndFingerprint)
         EXPECT_TRUE(c.run_request());
         auto msg_res =
             dynamic_cast<network::request_shutdown::response *>(res.get());
-        EXPECT_STREQ(msg_res->actions[0].verdict.c_str(), "block");
+        EXPECT_STREQ(msg_res->actions[0].verdict.c_str(), "ok");
         EXPECT_FALSE(std::regex_match(
             msg_res->meta["_dd.appsec.fp.http.endpoint"].c_str(),
             std::regex(

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
@@ -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