Skip to content

Protect against claimsPrincipal being null #7719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2025
Merged

Protect against claimsPrincipal being null #7719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed236d
Protect against claimsPrincipal being null
bouwkast Oct 28, 2025
1dd9429
Mark claimsPricipal as nullable
bouwkast Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Datadog.Trace/ClrProfiler/AutoInstrumentation/AspNetCore/UserEvents/HttpContextSetUser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public static class HttpContextSetUser

private const string HttpContextExtensionsTypeName = "Microsoft.AspNetCore.Http.DefaultHttpContext";

internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, ref ClaimsPrincipal claimsPrincipal)
internal static CallTargetState OnMethodBegin<TTarget>(TTarget instance, ref ClaimsPrincipal? claimsPrincipal)
{
if (Security.Instance is { IsTrackUserEventsEnabled: true } security)
{
var tracer = Tracer.Instance;
var scope = tracer.InternalActiveScope;
if (instance is HttpContext httpContext && scope is not null)
if (instance is HttpContext httpContext && scope is not null && claimsPrincipal is not null)
{
var span = scope.Span;
var foundUserId = false;
Expand Down
Loading