Merge pull request #75 from microsoftgraph/validate-azp-claim

Added check for `azp` claim in validation token
microsoftgraph · Sep 5, 2024 · e1367a3 · e1367a3
2 parents feab41a + 6c19cfe
commit e1367a3
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/Services/M365AppConfigService.cs b/src/Services/M365AppConfigService.cs
@@ -20,6 +20,8 @@ namespace GitHubConnector.Services;
 /// <param name="settings">The application settings.</param>
 public class M365AppConfigService(AppSettings settings)
 {
+    private static readonly string GraphNotificationPublisherId = "0bf30f3b-4a52-48df-9a82-234910c4a086";
+
     private readonly HttpListener listener = new();
     private readonly int port = settings.PortNumber;
     private readonly string tenantId = settings.TenantId ?? throw new ArgumentException("tenantId not set in app settings");
@@ -79,23 +81,31 @@ public async Task<bool> ValidateTokensAsync(List<string>? tokens)
         {
             try
             {
-                handler.ValidateToken(
+                var principal = handler.ValidateToken(
                     token,
                     new()
                     {
                         ValidateIssuer = true,
                         ValidateAudience = true,
                         ValidateIssuerSigningKey = true,
                         ValidateLifetime = true,
-                        ValidIssuers = new[]
-                        {
+                        ValidIssuers =
+                        [
                             $"https://login.microsoftonline.com/{tenantId}/v2.0",
                             $"https://sts.windows.net/{tenantId}/",
-                        },
+                        ],
                         ValidAudience = clientId,
                         IssuerSigningKeys = openIdConfig.SigningKeys,
                     },
                     out _);
+
+                var azpClaim = principal?.FindFirst("azp");
+                if (azpClaim != null && string.Compare(azpClaim.Value, GraphNotificationPublisherId, StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    continue;
+                }
+
+                return false;
             }
             catch (SecurityTokenValidationException)
             {