feat(Integrations): update user login and signup events collection

appsec/src/extension/user_tracking.c

@@ -181,7 +181,7 @@ bool dd_parse_user_collection_mode(
     return true;
 }
 
-zend_string *nullable dd_user_id_anonymize(zend_string *nonnull user_id)
+zend_string *nullable dd_user_info_anonymize(zend_string *nonnull user_info)
 {
     zend_string *digest;
     const php_hash_ops *ops;
@@ -215,7 +215,7 @@ zend_string *nullable dd_user_id_anonymize(zend_string *nonnull user_id)
 #endif
 
     ops->hash_update(
-        context, (unsigned char *)ZSTR_VAL(user_id), ZSTR_LEN(user_id));
+        context, (unsigned char *)ZSTR_VAL(user_info), ZSTR_LEN(user_info));
 
     digest = zend_string_alloc(ops->digest_size, 0);
     ops->hash_final((unsigned char *)ZSTR_VAL(digest), context);

appsec/src/extension/user_tracking.h

@@ -5,8 +5,8 @@
 // (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.
 #pragma once
 
-#include "configuration.h"
 #include "attributes.h"
+#include "configuration.h"
 #include <zend.h>
 
 typedef enum _user_collection_mode {
@@ -23,7 +23,7 @@ void dd_find_and_apply_verdict_for_user(zend_string *nonnull user_id);
 bool dd_parse_user_collection_mode(
     zai_str value, zval *nonnull decoded_value, bool persistent);
 
-zend_string*nullable dd_user_id_anonymize(zend_string *nonnull user_id);
+zend_string *nullable dd_user_info_anonymize(zend_string *nonnull user_id);
 
 user_collection_mode dd_get_user_collection_mode(void);
 zend_string *nonnull dd_get_user_collection_mode_zstr(void);

appsec/tests/extension/headers_collection_03.phpt

@@ -59,7 +59,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_signup_event("1234", [], false);
+track_user_signup_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_04.phpt

@@ -59,7 +59,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_success_event("1234", [], false);
+track_user_login_success_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_05.phpt

@@ -59,7 +59,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], false);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_06.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_signup_event("1234", [], true);
+track_user_signup_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_07.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_success_event("1234", [], true);
+track_user_login_success_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_08.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], true);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_09.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_signup_event("1234", [], true);
+track_user_signup_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_10.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_success_event("1234", [], true);
+track_user_login_success_event("1234", []);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_11.phpt

@@ -60,7 +60,7 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], true);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_12.phpt

@@ -59,8 +59,8 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], false);
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], true);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_13.phpt

@@ -59,8 +59,8 @@ $helper = Helper::createInitedRun([
 rinit();
 $helper->get_commands(); //ignore
 
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], true);
-track_user_login_failure_event("1234", true, ['email' => '[email protected]'], false);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
+track_user_login_failure_event("1234", true, ['email' => '[email protected]']);
 
 rshutdown();
 $helper->get_commands(); //ignore

appsec/tests/extension/headers_collection_14.phpt

@@ -0,0 +1,133 @@
+--TEST--
+All headers are collected when track_user_signup_event_automated is triggered by user
+--INI--
+extension=ddtrace.so
+datadog.appsec.log_file=/tmp/php_appsec_test.log
+datadog.appsec.log_level=debug
+datadog.appsec.enabled=1
+--ENV--
+HTTP_X_FORWARDED_FOR=7.7.7.7
+DD_TRACE_CLIENT_IP_HEADER_DISABLED=true
+HTTP_X_FORWARDED_FOR=7.7.7.6,10.0.0.1
+HTTP_X_CLIENT_IP=7.7.7.7
+HTTP_X_REAL_IP=7.7.7.8
+HTTP_X_FORWARDED=for="foo"
+HTTP_X_CLUSTER_CLIENT_IP=7.7.7.9
+HTTP_FORWARDED_FOR=7.7.7.10,10.0.0.1
+HTTP_FORWARDED=for="foo"
+HTTP_VIA=HTTP/1.1 GWA
+HTTP_TRUE_CLIENT_IP=7.7.7.11
+HTTP_CONTENT_TYPE=text/plain
+HTTP_CONTENT_LENGTH=0
+HTTP_CONTENT_ENCODING=utf-8
+HTTP_CONTENT_LANGUATE=pt-PT
+HTTP_HOST=myhost:8888
+HTTP_USER_AGENT=my user agent
+HTTP_ACCEPT=*/*
+HTTP_ACCEPT_ENCODING=gzip
+HTTP_ACCEPT_LANGUAGE=pt-PT
+HTTP_MY_HEADER=my header value
+HTTP_MY_OTHER_HEADER=my other header value
+HTTP_X_AMZN_TRACE_ID=amazontraceid
+HTTP_IGNORED_HEADER=ignored header
+HTTP_CLOUDFRONT_VIEWER_JA3_FINGERPRINT=cloudfrontviewer
+HTTP_CF_RAY=cfray
+HTTP_X_CLOUD_TRACE_CONTEXT=cloudtracecontext
+HTTP_X_APPGW_TRACE_ID=appgvtraceid
+HTTP_X_SIGSCI_REQUESTID=sigscirequestid
+HTTP_X_SIGSCI_TAGS=sigscitags
+HTTP_AKAMAI_USER_RISK=akamaiuserisk
+--GET--
+key=val
+--FILE--
+<?php
+use function datadog\appsec\testing\{rinit,ddtrace_rshutdown,rshutdown,mlog};
+use const datadog\appsec\testing\log_level\DEBUG;
+use function datadog\appsec\track_user_signup_event_automated;
+include __DIR__ . '/inc/ddtrace_version.php';
+
+ddtrace_version_at_least('0.79.0');
+
+include __DIR__ . '/inc/mock_helper.php';
+
+$helper = Helper::createInitedRun([
+    response_list(response_request_init([[['ok', []]]])),
+    response_list(response_request_shutdown([[['ok', []]], new ArrayObject(), new ArrayObject()])),
+], ['continuous' => true]);
+
+
+rinit();
+$helper->get_commands(); //ignore
+
+track_user_signup_event_automated("login", "1234", []);
+
+rshutdown();
+$helper->get_commands(); //ignore
+
+
+
+ddtrace_rshutdown();
+dd_trace_internal_fn('synchronous_flush');
+
+$commands = $helper->get_commands();
+$tags = $commands[0]['payload'][0][0]['meta'];
+
+$headers = array_filter($tags, function ($key) { return strpos($key, "http.request.headers.") === 0;}, ARRAY_FILTER_USE_KEY);
+ksort($headers);
+var_dump($headers);
+
+$helper->finished_with_commands();
+?>
+--EXPECTF--
+array(25) {
+  ["http.request.headers.accept"]=>
+  string(3) "*/*"
+  ["http.request.headers.accept-encoding"]=>
+  string(4) "gzip"
+  ["http.request.headers.accept-language"]=>
+  string(5) "pt-PT"
+  ["http.request.headers.akamai-user-risk"]=>
+  string(13) "akamaiuserisk"
+  ["http.request.headers.cf-ray"]=>
+  string(5) "cfray"
+  ["http.request.headers.cloudfront-viewer-ja3-fingerprint"]=>
+  string(16) "cloudfrontviewer"
+  ["http.request.headers.content-encoding"]=>
+  string(5) "utf-8"
+  ["http.request.headers.content-length"]=>
+  string(1) "0"
+  ["http.request.headers.content-type"]=>
+  string(10) "text/plain"
+  ["http.request.headers.forwarded"]=>
+  string(9) "for="foo""
+  ["http.request.headers.forwarded-for"]=>
+  string(17) "7.7.7.10,10.0.0.1"
+  ["http.request.headers.host"]=>
+  string(11) "myhost:8888"
+  ["http.request.headers.true-client-ip"]=>
+  string(8) "7.7.7.11"
+  ["http.request.headers.user-agent"]=>
+  string(13) "my user agent"
+  ["http.request.headers.via"]=>
+  string(12) "HTTP/1.1 GWA"
+  ["http.request.headers.x-amzn-trace-id"]=>
+  string(13) "amazontraceid"
+  ["http.request.headers.x-appgw-trace-id"]=>
+  string(12) "appgvtraceid"
+  ["http.request.headers.x-client-ip"]=>
+  string(7) "7.7.7.7"
+  ["http.request.headers.x-cloud-trace-context"]=>
+  string(17) "cloudtracecontext"
+  ["http.request.headers.x-cluster-client-ip"]=>
+  string(7) "7.7.7.9"
+  ["http.request.headers.x-forwarded"]=>
+  string(9) "for="foo""
+  ["http.request.headers.x-forwarded-for"]=>
+  string(16) "7.7.7.6,10.0.0.1"
+  ["http.request.headers.x-real-ip"]=>
+  string(7) "7.7.7.8"
+  ["http.request.headers.x-sigsci-requestid"]=>
+  string(15) "sigscirequestid"
+  ["http.request.headers.x-sigsci-tags"]=>
+  string(10) "sigscitags"
+}