Skip to content

Lozensky/perf fix graph service client #3251

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
Feb 22, 2025
Merged

Lozensky/perf fix graph service client #3251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c545e98
Moving validator to static member
JoshLozensky Feb 21, 2025
d777af1
fix formatting
JoshLozensky Feb 21, 2025
7a65cf7
removing now unused variable
JoshLozensky Feb 21, 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 src/Microsoft.Identity.Web.GraphServiceClient/GraphAuthenticationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ internal class GraphAuthenticationProvider : IAuthenticationProvider
private const string AuthorizationHeaderKey = "Authorization";
readonly IAuthorizationHeaderProvider _authorizationHeaderProvider;
readonly GraphServiceClientOptions _defaultAuthenticationOptions;
private static readonly AllowedHostsValidator _allowedGraphHostsValidator = new(["graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn", "canary.graph.microsoft.com", "graph.microsoft-ppe.com"]);
private readonly string[] _graphUris = ["graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn", "canary.graph.microsoft.com", "graph.microsoft-ppe.com"];
readonly IEnumerable<string> _defaultGraphScope = ["https://graph.microsoft.com/.default"];

Expand Down Expand Up @@ -83,9 +84,8 @@ public async Task AuthenticateRequestAsync(
authorizationHeaderProviderOptions = graphServiceClientOptions;
}

AllowedHostsValidator allowedHostsValidator = new(_graphUris);
// Add the authorization header
if (allowedHostsValidator.IsUrlHostValid(request.URI) && !request.Headers.ContainsKey(AuthorizationHeaderKey))
if (_allowedGraphHostsValidator.IsUrlHostValid(request.URI) && !request.Headers.ContainsKey(AuthorizationHeaderKey))
{
string authorizationHeader = await _authorizationHeaderProvider.CreateAuthorizationHeaderAsync(
authorizationHeaderProviderOptions!.RequestAppToken ? _defaultGraphScope : scopes!,
Expand Down
1 change: 0 additions & 1 deletion tests/E2E Tests/GraphServiceClientTests/GraphServiceClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ async Task TestAsync()
o.RequestAppToken = true;
});
});

}

[Fact]
Expand Down
Loading