Skip to content

Fix bug with AadIssuerValidator #3042

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
Dec 3, 2024
Merged

Fix bug with AadIssuerValidator #3042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb8f5b
Fix bug with AadIssuerValidator
ssmelov Nov 28, 2024
c1f27d2
Update
ssmelov Nov 28, 2024
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
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Validators/AadIssuerValidator/AadIssuerValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ internal static bool IsValidIssuer(string issuerTemplate, string tenantId, strin
return false;

// Ensure tokenIssuer is atleast as long as issuerTemplate with tenantIdTemplate replaced
if (tokenIssuer.Length <= templateTenantIdPosition + tenantId.Length)
if (tokenIssuer.Length < templateTenantIdPosition + tenantId.Length)
return false;

// Ensure the tenant ID in the token issuer matches the expected tenant ID
Expand Down
9 changes: 8 additions & 1 deletion test/Microsoft.IdentityModel.Validators.Tests/AadIssuerValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ public static TheoryData<AadIssuerValidatorTheoryData> AadIssuerValidationTestCa
var theoryData = new TheoryData<AadIssuerValidatorTheoryData>
{
// Success cases
new AadIssuerValidatorTheoryData("V1_TemplateWithoutTrailingSlash_Matches_V1_IssuerWithoutTrailingSlash_Success")
{
TemplatedIssuer = ValidatorConstants.AadIssuerV1CommonAuthorityWithoutTrailingSlash,
TokenIssuer = ValidatorConstants.V1IssuerWithoutTrailingSlash,
TenantIdClaim = ValidatorConstants.TenantIdAsGuid,
ExpectedResult = true,
},
new AadIssuerValidatorTheoryData("V1_Template_Matches_V1_Issuer_Success")
{
TemplatedIssuer = ValidatorConstants.AadIssuerV1CommonAuthority,
Expand Down Expand Up @@ -106,7 +113,7 @@ public static TheoryData<AadIssuerValidatorTheoryData> AadIssuerValidationTestCa

public class AadIssuerValidatorTheoryData : TheoryDataBase
{
public AadIssuerValidatorTheoryData() {}
public AadIssuerValidatorTheoryData() { }

public AadIssuerValidatorTheoryData(string testId) : base(testId) { }

Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.IdentityModel.Validators.Tests/ValidatorConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ internal class ValidatorConstants
public const string UsGovIssuer = "https://login.microsoftonline.us/" + UsGovTenantId + "/v2.0";
public const string UsGovTenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
public const string V1Issuer = "https://sts.windows.net/f645ad92-e38d-4d1a-b510-d1b09a74a8ca/";
public const string V1IssuerWithoutTrailingSlash = "https://sts.windows.net/f645ad92-e38d-4d1a-b510-d1b09a74a8ca";
public const string V1IssuerPPE = "https://sts.windows-ppe.net/f645ad92-e38d-4d1a-b510-d1b09a74a8ca/";
public const string AadIssuerV1CommonAuthority = "https://sts.windows.net/{tenantid}/";
public const string AadIssuerV1CommonAuthorityWithoutTrailingSlash = "https://sts.windows.net/{tenantid}";
public const string AadIssuerV11CommonAuthority = AadInstance + "/{tenantid}/v1.1";
public const string AadIssuerV2CommonAuthority = AadInstance + "/{tenantid}/v2.0";

Expand Down
Loading