adapt integration tests

DataDog · Nov 19, 2024 · 14f86c6 · 14f86c6
1 parent ad5d775
commit 14f86c6
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 9 deletions.
diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5AutoUserEvents.cs b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetCore5AutoUserEvents.cs
@@ -115,12 +115,9 @@ public AspNetCore5AutoUserEventsAnonModeSecurityEnabled(AspNetCoreTestFixture fi
         }
     }
 
-    public class AspNetCore5AutoUserEventsExtendedModeSecurityDisabled : AspNetCore5AutoUserEvents
+    public class AspNetCore5AutoUserEventsExtendedModeSecurityDisabled(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper)
+        : AspNetCore5AutoUserEvents(fixture, outputHelper, false, "extended")
     {
-        public AspNetCore5AutoUserEventsExtendedModeSecurityDisabled(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, false, "extended")
-        {
-        }
     }
 }
 #endif
diff --git a/tracer/test/snapshots/Security.AspNetCore5AsmFeatureUserIdSecurityEnabled._.verified.txt b/tracer/test/snapshots/Security.AspNetCore5AsmFeatureUserIdSecurityEnabled._.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: Guid_2,
       _dd.appsec.events.users.login.success.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_2,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...test/snapshots/Security.AspNetCore5AsmFeatureUserIdSecurityRemoteActivated._.verified.txt b/...test/snapshots/Security.AspNetCore5AsmFeatureUserIdSecurityRemoteActivated._.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: Guid_2,
       _dd.appsec.events.users.login.success.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_2,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.failure1.verified.txt b/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.failure1.verified.txt
@@ -10,6 +10,7 @@
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: true,
       appsec.events.users.login.failure.usr.id: anon_7bcd1c9fc4f6e4c2460e0ad38d6ad0d9,
+      appsec.events.users.login.failure.usr.login: anon_eb97d409396a3e5392936dad92b909da,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +31,8 @@
       runtime-id: Guid_1,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: anonymization,
+      _dd.appsec.usr.id: anon_7bcd1c9fc4f6e4c2460e0ad38d6ad0d9,
+      _dd.appsec.usr.login: anon_eb97d409396a3e5392936dad92b909da,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.failure2.verified.txt b/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.failure2.verified.txt
@@ -9,7 +9,7 @@
     Tags: {
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: false,
-      appsec.events.users.login.failure.usr.id: anon_c34de12d00b78a9977da847b7e55202e,
+      appsec.events.users.login.failure.usr.login: anon_c34de12d00b78a9977da847b7e55202e,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +30,7 @@
       runtime-id: Guid_1,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: anonymization,
+      _dd.appsec.usr.login: anon_c34de12d00b78a9977da847b7e55202e,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...ts/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.success.verified.txt b/...ts/Security.AspNetCore5AutoUserEvents.SecurityOn.anonmode-login.auto.success.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: anon_eb97d409396a3e5392936dad92b909da,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: anon_7bcd1c9fc4f6e4c2460e0ad38d6ad0d9,
       _dd.appsec.events.users.login.success.auto.mode: anonymization,
+      _dd.appsec.usr.id: anon_7bcd1c9fc4f6e4c2460e0ad38d6ad0d9,
+      _dd.appsec.usr.login: anon_eb97d409396a3e5392936dad92b909da,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.failure1.verified.txt b/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.failure1.verified.txt
@@ -10,6 +10,7 @@
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: true,
       appsec.events.users.login.failure.usr.id: Guid_1,
+      appsec.events.users.login.failure.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +31,8 @@
       runtime-id: Guid_2,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_1,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.failure2.verified.txt b/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.failure2.verified.txt
@@ -9,7 +9,7 @@
     Tags: {
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: false,
-      appsec.events.users.login.failure.usr.id: NoSuchUser,
+      appsec.events.users.login.failure.usr.login: NoSuchUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +30,7 @@
       runtime-id: Guid_1,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.login: NoSuchUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...Security.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.success.verified.txt b/...Security.AspNetCore5AutoUserEvents.SecurityOn.defaultmode-login.auto.success.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: Guid_2,
       _dd.appsec.events.users.login.success.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_2,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...curity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.failure1.verified.txt b/...curity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.failure1.verified.txt
@@ -10,6 +10,7 @@
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: true,
       appsec.events.users.login.failure.usr.id: Guid_1,
+      appsec.events.users.login.failure.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +31,8 @@
       runtime-id: Guid_2,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_1,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...curity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.failure2.verified.txt b/...curity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.failure2.verified.txt
@@ -9,7 +9,7 @@
     Tags: {
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: false,
-      appsec.events.users.login.failure.usr.id: NoSuchUser,
+      appsec.events.users.login.failure.usr.login: NoSuchUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +30,7 @@
       runtime-id: Guid_1,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.login: NoSuchUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.success.verified.txt b/...ecurity.AspNetCore5AutoUserEvents.SecurityOn.extendedmode-login.auto.success.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: Guid_2,
       _dd.appsec.events.users.login.success.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_2,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/.../Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.failure1.verified.txt b/.../Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.failure1.verified.txt
@@ -10,6 +10,7 @@
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: true,
       appsec.events.users.login.failure.usr.id: Guid_1,
+      appsec.events.users.login.failure.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +31,8 @@
       runtime-id: Guid_2,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_1,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/.../Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.failure2.verified.txt b/.../Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.failure2.verified.txt
@@ -9,7 +9,7 @@
     Tags: {
       appsec.events.users.login.failure.track: true,
       appsec.events.users.login.failure.usr.exists: false,
-      appsec.events.users.login.failure.usr.id: NoSuchUser,
+      appsec.events.users.login.failure.usr.login: NoSuchUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -30,6 +30,7 @@
       runtime-id: Guid_1,
       span.kind: server,
       _dd.appsec.events.users.login.failure.auto.mode: identification,
+      _dd.appsec.usr.login: NoSuchUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {

diff --git a/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.success.verified.txt b/...s/Security.AspNetCore5AutoUserEvents.SecurityOn.identmode-login.auto.success.verified.txt
@@ -8,6 +8,7 @@
     Type: web,
     Tags: {
       appsec.events.users.login.success.track: true,
+      appsec.events.users.login.success.usr.login: TestUser,
       aspnet_core.endpoint: Samples.Security.AspNetCore5.Controllers.AccountController.Index (Samples.Security.AspNetCore5),
       aspnet_core.route: {controller=home}/{action=index}/{id?},
       component: aspnet_core,
@@ -29,6 +30,8 @@
       span.kind: server,
       usr.id: Guid_2,
       _dd.appsec.events.users.login.success.auto.mode: identification,
+      _dd.appsec.usr.id: Guid_2,
+      _dd.appsec.usr.login: TestUser,
       _dd.runtime_family: dotnet
     },
     Metrics: {