Skip to content
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

Disable token cache for service principal #20336

Merged
merged 4 commits into from
Dec 1, 2022
Merged

Disable token cache for service principal #20336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a56ab5
disable token cache for service principal
isra-fel Dec 1, 2022
24c6e9c
Merge branch 'release-2022-12-06' into disable-sp-cache
Nickcandy Dec 1, 2022
f08c162
Merge branch 'release-2022-12-06' into disable-sp-cache
Nickcandy Dec 1, 2022
5713cdf
Merge branch 'release-2022-12-06' into disable-sp-cache
msJinLei Dec 1, 2022
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: 1 addition & 3 deletions src/Accounts/Accounts/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
-->

## Upcoming Release
* Enabled caching tokens when logging in with a service principal or client assertion. [#20013]
- This could reduce extra network traffic and improve performance.
- It also fixed the incorrectly short lifespan of tokens.
* Enabled caching tokens when logging in with a client assertion. This fixed the incorrectly short lifespan of tokens.
* Upgraded target framework of Microsoft.Identity.Client to net461 [#20189]
* Stored `ServicePrincipalSecret` and `CertificatePassword` into `AzKeyStore`.
* Updated the reference of Azure PowerShell Common to 1.3.65-preview.
Expand Down
8 changes: 5 additions & 3 deletions src/Accounts/Authenticators/ServicePrincipalAuthenticator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ public override Task<IAccessToken> Authenticate(AuthenticationParameters paramet
var authority = spParameters.Environment.ActiveDirectoryAuthority;

var requestContext = new TokenRequestContext(scopes);
var tokenCachePersistenceOptions = spParameters.TokenCacheProvider.GetTokenCachePersistenceOptions();
// var tokenCachePersistenceOptions = spParameters.TokenCacheProvider.GetTokenCachePersistenceOptions();
AzureSession.Instance.TryGetComponent(nameof(AzureCredentialFactory), out AzureCredentialFactory azureCredentialFactory);

var options = new ClientCertificateCredentialOptions()
{
TokenCachePersistenceOptions = tokenCachePersistenceOptions, // allows MSAL to cache access tokens
// commented due to https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/3218
// todo: investigate splitting user token cache and app token cache
// TokenCachePersistenceOptions = tokenCachePersistenceOptions, // allows MSAL to cache access tokens
AuthorityHost = new Uri(authority),
SendCertificateChain = spParameters.SendCertificateChain ?? default(bool)
};
Expand All @@ -67,7 +69,7 @@ public override Task<IAccessToken> Authenticate(AuthenticationParameters paramet
//Service principal with secret
var csOptions = new ClientSecretCredentialOptions()
{
TokenCachePersistenceOptions = tokenCachePersistenceOptions, // allows MSAL to cache access tokens
// TokenCachePersistenceOptions = tokenCachePersistenceOptions, // allows MSAL to cache access tokens
AuthorityHost = new Uri(authority)
};
tokenCredential = azureCredentialFactory.CreateClientSecretCredential(tenantId, spParameters.ApplicationId, spParameters.Secret, csOptions);
Expand Down