Skip to content

Fix authority parsing logic #3261

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 3 commits into from
Mar 7, 2025
Merged

Fix authority parsing logic #3261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
025656b
Adjust starting index configuration
JoshLozensky Feb 25, 2025
3f9dd50
make logic scheme agnostic
JoshLozensky Feb 25, 2025
2dce84c
Add unit tests
JoshLozensky Feb 27, 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
9 changes: 6 additions & 3 deletions src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,11 +442,14 @@ internal static void ParseAuthorityIfNecessary(MergedOptions mergedOptions)
{
if (string.IsNullOrEmpty(mergedOptions.TenantId) && string.IsNullOrEmpty(mergedOptions.Instance) && !string.IsNullOrEmpty(mergedOptions.Authority))
{
const int StartingIndex = 8; // length of "https://"
ReadOnlySpan<char> doubleSlash = "//".AsSpan();
ReadOnlySpan<char> authoritySpan = mergedOptions.Authority.AsSpan().TrimEnd('/');
int doubleSlashIndex = authoritySpan.IndexOf(doubleSlash);
int startingIndex = doubleSlashIndex == -1 ? 0 : doubleSlashIndex + doubleSlash.Length;

int indexTenant = authoritySpan.Slice(StartingIndex).IndexOf('/') + StartingIndex;
if (indexTenant >= 0)
// Gets position of first '/' after the "https://" prefix, will return -1 if not found, this checks for presence of instance/tenantId
int indexTenant = authoritySpan.Slice(startingIndex).IndexOf('/') + startingIndex;
if (indexTenant >= startingIndex)
{
int indexVersion = authoritySpan.Slice(indexTenant + 1).IndexOf('/');
int indexEndOfTenant = indexVersion == -1 ? authoritySpan.Length : indexVersion + indexTenant + 1;
Expand Down
39 changes: 39 additions & 0 deletions tests/Microsoft.Identity.Web.Test/TokenAcquisitionAuthorityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,45 @@ public void TestParseAuthorityIfNecessary_V2Authority()
Assert.Equal(TC.TenantIdAsGuid, mergedOptions.TenantId);
}

[Fact]
public void TestParseAuthorityIfNecessary_NoUriScheme()
{
var tenantId = TC.TenantIdAsGuid.ToString();
var instance = "myauthorityisbetter.fyi";
var authority = $"{instance}/{tenantId}/v2.0";

MergedOptions mergedOptions = new()
{
Authority = authority,
PreserveAuthority = false
};

MergedOptions.ParseAuthorityIfNecessary(mergedOptions);

Assert.Equal(authority, mergedOptions.Authority);
Assert.Equal(tenantId, mergedOptions.TenantId);
Assert.Equal(instance, mergedOptions.Instance);
}

[Fact]
public void TestParseAuthorityIfNecessary_NoTenantId()
{
var instance = "myauthorityisbetter.fyi";
var authority = $"https://{instance}";

MergedOptions mergedOptions = new()
{
Authority = authority,
PreserveAuthority = false
};

MergedOptions.ParseAuthorityIfNecessary(mergedOptions);

Assert.Equal(authority, mergedOptions.Authority);
Assert.Null(mergedOptions.TenantId);
Assert.Null(mergedOptions.Instance);
}

[Fact]
public void MergeExtraQueryParametersTest()
{
Expand Down
Loading