diff --git a/appsec/src/extension/tags.c b/appsec/src/extension/tags.c index 0c2c1bb211..6998ca8cd5 100644 --- a/appsec/src/extension/tags.c +++ b/appsec/src/extension/tags.c @@ -1016,6 +1016,8 @@ static PHP_FUNCTION(datadog_appsec_track_user_signup_event_automated) return; } + zend_string_release(user_login); + zend_string_release(user_id); user_login = anon_user_login; user_id = anon_user_id; } @@ -1159,6 +1161,8 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_success_event_automated) return; } + zend_string_release(user_login); + zend_string_release(user_id); user_login = anon_user_login; user_id = anon_user_id; } @@ -1230,6 +1234,8 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_success_event) _user_event_triggered = true; zend_array *meta_ht = Z_ARRVAL_P(meta); + dd_find_and_apply_verdict_for_user(user_id); + // usr.id = _add_new_zstr_to_meta( meta_ht, _dd_tag_user_id, user_id, copy_user_id, true); @@ -1307,6 +1313,8 @@ static PHP_FUNCTION(datadog_appsec_track_user_login_failure_event_automated) metadata = NULL; } + zend_string_release(user_login); + zend_string_release(user_id); user_login = anon_user_login; user_id = anon_user_id; } diff --git a/appsec/tests/extension/track_user_signup_event_sdk_takes_priority.phpt b/appsec/tests/extension/track_user_signup_event_sdk_takes_priority.phpt index ccc0152788..183c62a986 100644 --- a/appsec/tests/extension/track_user_signup_event_sdk_takes_priority.phpt +++ b/appsec/tests/extension/track_user_signup_event_sdk_takes_priority.phpt @@ -9,6 +9,7 @@ DD_APPSEC_ENABLED=1 use function datadog\appsec\testing\root_span_get_meta; use function datadog\appsec\track_user_signup_event; use function datadog\appsec\track_user_signup_event_automated; + include __DIR__ . '/inc/ddtrace_version.php'; ddtrace_version_at_least('0.79.0'); 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 3e7a22454a..de82845944 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 @@ -69,9 +69,6 @@ trait CommonTests { assert span.meta."_dd.appsec.usr.id" == 'Admin' assert span.meta."_dd.appsec.usr.login" == 'Login' assert span.meta."appsec.events.users.login.success.track" == 'true' - assert span.meta."appsec.events.users.login.success.email" == 'jean.example@example.com' - assert span.meta."appsec.events.users.login.success.session_id" == '987654321' - assert span.meta."appsec.events.users.login.success.role" == 'admin' } @Test @@ -104,9 +101,6 @@ trait CommonTests { assert span.meta."appsec.events.users.login.failure.usr.login" == 'Login' assert span.meta."appsec.events.users.login.failure.usr.exists" == 'false' assert span.meta."appsec.events.users.login.failure.track" == 'true' - assert span.meta."appsec.events.users.login.failure.email" == 'jean.example@example.com' - assert span.meta."appsec.events.users.login.failure.session_id" == '987654321' - assert span.meta."appsec.events.users.login.failure.role" == 'admin' } @Test