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

Gparametr/json web token handler create token dispose key wrap provider #3088

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Gparametr/json web token handler create token dispose key wrap provider #3088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17383a0
JsonWebTokenHandler.CreateToken(): dispose KeyWrapProvider.
gparametr Jan 10, 2025
5becfc1
Merge branch 'AzureAD:dev' into gparametr/JsonWebTokenHandler_CreateT…
gparametr Jan 10, 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
12 changes: 10 additions & 2 deletions src/Microsoft.IdentityModel.JsonWebTokens/JsonWebTokenHandler.CreateToken.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,7 @@ internal IEnumerable<SecurityKey> GetContentEncryptionKeys(JsonWebToken jwtToken
StringBuilder keysAttempted = null;
foreach (var key in keys)
{
KeyWrapProvider kwp = null;
try
{
#if NET472 || NET6_0_OR_GREATER
Expand Down Expand Up @@ -1365,15 +1366,15 @@ internal IEnumerable<SecurityKey> GetContentEncryptionKeys(JsonWebToken jwtToken
jwtToken.TryGetHeaderValue(JwtHeaderParameterNames.Apu, out string apu);
jwtToken.TryGetHeaderValue(JwtHeaderParameterNames.Apv, out string apv);
SecurityKey kdf = ecdhKeyExchangeProvider.GenerateKdf(apu, apv);
var kwp = key.CryptoProviderFactory.CreateKeyWrapProviderForUnwrap(kdf, ecdhKeyExchangeProvider.GetEncryptionAlgorithm());
kwp = key.CryptoProviderFactory.CreateKeyWrapProviderForUnwrap(kdf, ecdhKeyExchangeProvider.GetEncryptionAlgorithm());
var unwrappedKey = kwp.UnwrapKey(Base64UrlEncoder.DecodeBytes(jwtToken.EncryptedKey));
unwrappedKeys.Add(new SymmetricSecurityKey(unwrappedKey));
}
else
#endif
if (key.CryptoProviderFactory.IsSupportedAlgorithm(jwtToken.Alg, key))
{
var kwp = key.CryptoProviderFactory.CreateKeyWrapProviderForUnwrap(key, jwtToken.Alg);
kwp = key.CryptoProviderFactory.CreateKeyWrapProviderForUnwrap(key, jwtToken.Alg);
var unwrappedKey = kwp.UnwrapKey(jwtToken.EncryptedKeyBytes);
unwrappedKeys.Add(new SymmetricSecurityKey(unwrappedKey));
}
Expand All @@ -1382,6 +1383,13 @@ internal IEnumerable<SecurityKey> GetContentEncryptionKeys(JsonWebToken jwtToken
{
(exceptionStrings ??= new StringBuilder()).AppendLine(ex.ToString());
}
finally
{
if (kwp != null)
{
key.CryptoProviderFactory.ReleaseKeyWrapProvider(kwp);
}
}

(keysAttempted ??= new StringBuilder()).AppendLine(key.ToString());
}
Expand Down