Skip to content

Commit 45c35d7

Browse files
LeiyksLeiyks
committed
chore(appsec): debug flaky zts tests
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent 75d0280 commit 45c35d7

File tree

2 files changed

+56
-57
lines changed

2 files changed

+56
-57
lines changed

‎appsec/src/extension/tags.c

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <SAPI.h>
2121
#include <Zend/zend.h>
2222
#include <zend_smart_str.h>
23+
#include <zend_string.h>
2324
#include <zend_types.h>
2425

2526
#if PHP_VERSION_ID < 70200
@@ -1015,18 +1016,16 @@ static PHP_FUNCTION(datadog_appsec_track_user_signup_event_automated)
10151016
zend_string_release(anon_user_id);
10161017
return;
10171018
}
1018-
1019-
user_login = anon_user_login;
1020-
user_id = anon_user_id;
10211019
}
10221020

10231021
if (ZSTR_LEN(user_id) > 0) {
10241022
// usr.id = <user_id>
1025-
_add_new_zstr_to_meta(meta_ht, _dd_tag_user_id, user_id, true, false);
1023+
_add_new_zstr_to_meta(meta_ht, _dd_tag_user_id,
1024+
anon_user_id ? anon_user_id : user_id, true, false);
10261025

10271026
// _dd.appsec.usr.id = <user_id>
1028-
_add_new_zstr_to_meta(
1029-
meta_ht, _dd_appsec_user_id, user_id, false, true);
1027+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_id,
1028+
anon_user_id ? anon_user_id : user_id, !anon_user_id, true);
10301029
}
10311030

10321031
// _dd.appsec.events.users.signup.auto.mode =
@@ -1035,12 +1034,12 @@ static PHP_FUNCTION(datadog_appsec_track_user_signup_event_automated)
10351034
dd_get_user_collection_mode_zstr(), true, false);
10361035

10371036
// _dd.appsec.events.users.signup.usr.login = <user_login>
1038-
_add_new_zstr_to_meta(
1039-
meta_ht, _dd_signup_event_login, user_login, true, true);
1037+
_add_new_zstr_to_meta(meta_ht, _dd_signup_event_login,
1038+
anon_user_login ? anon_user_login : user_login, true, true);
10401039

10411040
// _dd.appsec.usr.login = <user_login>
1042-
_add_new_zstr_to_meta(
1043-
meta_ht, _dd_appsec_user_login, user_login, false, true);
1041+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_login,
1042+
anon_user_login ? anon_user_login : user_login, !anon_user_login, true);
10441043

10451044
// appsec.events.users.signup.success.track = true
10461045
_add_custom_event_keyval(
@@ -1167,11 +1166,12 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_success_event_automated)
11671166
dd_find_and_apply_verdict_for_user(user_id);
11681167

11691168
// usr.id = <user_id>
1170-
_add_new_zstr_to_meta(meta_ht, _dd_tag_user_id, user_id, true, false);
1169+
_add_new_zstr_to_meta(meta_ht, _dd_tag_user_id,
1170+
anon_user_id ? anon_user_id : user_id, true, false);
11711171

11721172
// _dd.appsec.usr.id = <user_id>
1173-
_add_new_zstr_to_meta(
1174-
meta_ht, _dd_appsec_user_id, user_id, false, true);
1173+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_id,
1174+
anon_user_id ? anon_user_id : user_id, !anon_user_id, true);
11751175
}
11761176

11771177
// _dd.appsec.events.users.login.success.auto.mode =
@@ -1180,12 +1180,12 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_success_event_automated)
11801180
dd_get_user_collection_mode_zstr(), true, false);
11811181

11821182
// _dd.appsec.events.users.login.success.usr.login = <user_login>
1183-
_add_new_zstr_to_meta(
1184-
meta_ht, _dd_login_success_event_login, user_login, true, true);
1183+
_add_new_zstr_to_meta(meta_ht, _dd_login_success_event_login,
1184+
anon_user_login ? anon_user_login : user_login, true, true);
11851185

11861186
// _dd.appsec.usr.login = <user_login>
1187-
_add_new_zstr_to_meta(
1188-
meta_ht, _dd_appsec_user_login, user_login, false, true);
1187+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_login,
1188+
anon_user_login ? anon_user_login : user_login, !anon_user_login, true);
11891189

11901190
// appsec.events.users.login.success.track = true
11911191
_add_custom_event_keyval(
@@ -1308,19 +1308,17 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_failure_event_automated)
13081308
if (metadata && zend_array_count(metadata) > 0) {
13091309
metadata = NULL;
13101310
}
1311-
1312-
user_login = anon_user_login;
1313-
user_id = anon_user_id;
13141311
}
13151312

13161313
if (ZSTR_LEN(user_id) > 0) {
13171314
// appsec.events.users.login.failure.usr.id = <user_id>
13181315
_add_custom_event_keyval(meta_ht, _dd_login_failure_event,
1319-
_dd_tag_user_id, user_id, true, false);
1316+
_dd_tag_user_id, anon_user_id ? anon_user_id : user_id, true,
1317+
false);
13201318

13211319
// _dd.appsec.usr.id = <user_id>
1322-
_add_new_zstr_to_meta(
1323-
meta_ht, _dd_appsec_user_id, user_id, false, true);
1320+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_id,
1321+
anon_user_id ? anon_user_id : user_id, !anon_user_id, true);
13241322
}
13251323

13261324
// _dd.appsec.events.users.login.failure.auto.mode =
@@ -1330,12 +1328,13 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_failure_event_automated)
13301328

13311329
if (ZSTR_LEN(user_login) > 0) {
13321330
// _dd.appsec.events.users.login.failure.usr.login = <user_login>
1333-
_add_new_zstr_to_meta(
1334-
meta_ht, _dd_login_failure_event_login, user_login, true, true);
1331+
_add_new_zstr_to_meta(meta_ht, _dd_login_failure_event_login,
1332+
anon_user_login ? anon_user_login : user_login, true, true);
13351333

13361334
// _dd.appsec.usr.login = <user_login>
1337-
_add_new_zstr_to_meta(
1338-
meta_ht, _dd_appsec_user_login, user_login, false, true);
1335+
_add_new_zstr_to_meta(meta_ht, _dd_appsec_user_login,
1336+
anon_user_login ? anon_user_login : user_login, !anon_user_login,
1337+
true);
13391338
}
13401339

13411340
// appsec.events.users.login.failure.track = true

‎appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ trait CommonTests {
5656
assert span.meta."appsec.events.users.login.success.role" == 'admin'
5757
}
5858

59-
@Test
60-
void 'user login success event automated'() {
61-
Trace trace = container.traceFromRequest('/user_login_success_automated.php') { HttpResponse<InputStream> resp ->
62-
assert resp.statusCode() == 200
63-
}
64-
65-
Span span = trace.first()
66-
assert span.metrics._sampling_priority_v1 == 2.0d
67-
assert span.meta."usr.id" == 'Admin'
68-
assert span.meta."appsec.events.users.login.success.usr.login" == 'Login'
69-
assert span.meta."_dd.appsec.usr.id" == 'Admin'
70-
assert span.meta."_dd.appsec.usr.login" == 'Login'
71-
assert span.meta."appsec.events.users.login.success.track" == 'true'
72-
}
59+
// @Test
60+
// void 'user login success event automated'() {
61+
// Trace trace = container.traceFromRequest('/user_login_success_automated.php') { HttpResponse<InputStream> resp ->
62+
// assert resp.statusCode() == 200
63+
// }
64+
//
65+
// Span span = trace.first()
66+
// assert span.metrics._sampling_priority_v1 == 2.0d
67+
// assert span.meta."usr.id" == 'Admin'
68+
// assert span.meta."appsec.events.users.login.success.usr.login" == 'Login'
69+
// assert span.meta."_dd.appsec.usr.id" == 'Admin'
70+
// assert span.meta."_dd.appsec.usr.login" == 'Login'
71+
// assert span.meta."appsec.events.users.login.success.track" == 'true'
72+
// }
7373

7474
@Test
7575
void 'user login failure event'() {
@@ -79,29 +79,29 @@ trait CommonTests {
7979

8080
Span span = trace.first()
8181
assert span.metrics._sampling_priority_v1 == 2.0d
82-
assert span.meta."appsec.events.users.login.failure.usr.id" == 'Admin'
82+
assert span.meta."appsec.events.users.login.failure.usr.id" == 'Admine'
8383
assert span.meta."appsec.events.users.login.failure.usr.exists" == 'false'
8484
assert span.meta."appsec.events.users.login.failure.track" == 'true'
8585
assert span.meta."appsec.events.users.login.failure.email" == '[email protected]'
8686
assert span.meta."appsec.events.users.login.failure.session_id" == '987654321'
8787
assert span.meta."appsec.events.users.login.failure.role" == 'admin'
8888
}
8989

90-
@Test
91-
void 'user login failure event automated'() {
92-
def trace = container.traceFromRequest('/user_login_failure_automated.php') { HttpResponse<InputStream> resp ->
93-
assert resp.statusCode() == 200
94-
}
95-
96-
Span span = trace.first()
97-
assert span.metrics._sampling_priority_v1 == 2.0d
98-
assert span.meta."appsec.events.users.login.failure.usr.id" == 'Admin'
99-
assert span.meta."_dd.appsec.usr.id" == 'Admin'
100-
assert span.meta."_dd.appsec.usr.login" == 'Login'
101-
assert span.meta."appsec.events.users.login.failure.usr.login" == 'Login'
102-
assert span.meta."appsec.events.users.login.failure.usr.exists" == 'false'
103-
assert span.meta."appsec.events.users.login.failure.track" == 'true'
104-
}
90+
// @Test
91+
// void 'user login failure event automated'() {
92+
// def trace = container.traceFromRequest('/user_login_failure_automated.php') { HttpResponse<InputStream> resp ->
93+
// assert resp.statusCode() == 200
94+
// }
95+
//
96+
// Span span = trace.first()
97+
// assert span.metrics._sampling_priority_v1 == 2.0d
98+
// assert span.meta."appsec.events.users.login.failure.usr.id" == 'Admin'
99+
// assert span.meta."_dd.appsec.usr.id" == 'Admin'
100+
// assert span.meta."_dd.appsec.usr.login" == 'Login'
101+
// assert span.meta."appsec.events.users.login.failure.usr.login" == 'Login'
102+
// assert span.meta."appsec.events.users.login.failure.usr.exists" == 'false'
103+
// assert span.meta."appsec.events.users.login.failure.track" == 'true'
104+
// }
105105

106106
@Test
107107
void 'custom event'() {

0 commit comments

Comments
 (0)