Skip to content

Commit 1947555

Browse files
GeoKGeoK
committed
Rebase on top of Dev
1 parent 482c5aa commit 1947555

File tree

18 files changed

+75
-10
lines changed

18 files changed

+75
-10
lines changed

‎src/Microsoft.IdentityModel.Tokens/Encryption/AuthenticatedEncryptionProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public virtual AuthenticatedEncryptionResult Encrypt(byte[] plaintext, byte[] au
132132
if (IsAesGcmAlgorithm(Algorithm))
133133
{
134134
// Until there is no AES-GCM support, Encrypt and Decrypt operations will throw an exception
135-
throw LogHelper.LogExceptionMessage(new SecurityTokenEncryptionFailedException(LogHelper.FormatInvariant(LogMessages.IDX10688, Algorithm)));
135+
throw LogHelper.LogExceptionMessage(new SecurityTokenEncryptionFailedException(LogHelper.FormatInvariant(LogMessages.IDX10692, Algorithm)));
136136
}
137137

138138
if (authenticatedData == null || authenticatedData.Length == 0)
@@ -190,7 +190,7 @@ public virtual byte[] Decrypt(byte[] ciphertext, byte[] authenticatedData, byte[
190190
if (IsAesGcmAlgorithm(Algorithm))
191191
{
192192
// Until there is no AES-GCM support, Encrypt and Decrypt operations will throw an exception
193-
throw LogHelper.LogExceptionMessage(new SecurityTokenDecryptionFailedException(LogHelper.FormatInvariant(LogMessages.IDX10688, Algorithm)));
193+
throw LogHelper.LogExceptionMessage(new SecurityTokenDecryptionFailedException(LogHelper.FormatInvariant(LogMessages.IDX10692, Algorithm)));
194194
}
195195

196196
if (authenticatedData == null || authenticatedData.Length == 0)

‎src/Microsoft.IdentityModel.Tokens/InternalsVisibleTo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@
2626
//------------------------------------------------------------------------------
2727

2828
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.KeyVaultExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
29+
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.Tokens.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
2930
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.IdentityModel.Tokens.Saml.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎src/Microsoft.IdentityModel.Tokens/LogMessages.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ internal static class LogMessages
183183
public const string IDX10684 = "IDX10684: Unable to create a AsymmetricAdapter, Algorithm: '{0}', Key: '{1}'.";
184184
public const string IDX10685 = "IDX10685: Unable to Sign, Internal SignFunction is not available.";
185185
public const string IDX10686 = "IDX10686: Unable to Verify, Internal VerifyFunction is not available.";
186-
public const string IDX10687 = "IDX10687: Unable to create a AsymmetricAdapter. For NET45 or NET451 only types: '{0}' or '{1}' are supported. RSA is of type: '{2}'..";
186+
public const string IDX10687 = "IDX10687: Unable to create a AsymmetricAdapter. For NET45 or NET451 only types: '{0}' or '{1}' are supported. RSA is of type: '{2}'.";
187187
//public const string IDX10688 = "IDX10688:";
188188
public const string IDX10689 = "IDX10689: Unable to create an ECDsa object. See inner exception for more details.";
189189
public const string IDX10690 = "IDX10690: ECDsa creation is not supported by NETSTANDARD1.4, when running on platforms other than Windows. For more details, see https://aka.ms/IdentityModel/create-ecdsa";
190190
public const string IDX10691 = "IDX10691: Unable to create an ECDsa object, internal CreateECDsaFunction is not available.";
191-
public const string IDX10688 = "IDX10688: The algorithm '{0}' is not currently supported. In order to use the algorithm '{0}' one should create custom CryptoProviderFactory and AuthenticatedEncryptionProvider.";
191+
public const string IDX10692 = "IDX10692: The algorithm '{0}' is not currently supported. It's possible to provide your own implementation of the algorithm by overriding CryptoProviderFactory and AuthenticatedEncryptionProvider. Example: aka.ms/identitymodel-aesgcm-support";
192192

193193
// security keys
194194
public const string IDX10700 = "IDX10700: Invalid RsaParameters: '{0}'. Both modulus and exponent should be present";

‎test/CrossVersionTokenValidation.Tests/Saml2CrossVersionTokenValidationTests.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ public static TheoryData<CrossTokenVersionTheoryData> CrossVersionSaml2TokenTest
139139
Expires = Default.Expires,
140140
Issuer = Default.Issuer,
141141
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
142+
#pragma warning disable 0618
142143
Subject = new ClaimsIdentity(Default.SamlClaims)
144+
#pragma warning restore 0618
143145
},
144146
ValidationParameters4x = new TokenValidationParameters4x
145147
{
@@ -189,7 +191,9 @@ public static TheoryData<CrossTokenVersionTheoryData> CrossVersionSaml2TokenTest
189191
Expires = Default.Expires,
190192
Issuer = Default.Issuer,
191193
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
194+
#pragma warning disable 0618
192195
Subject = AuthenticationClaimsIdentity
196+
#pragma warning restore 0618
193197
},
194198
ValidationParameters4x = new TokenValidationParameters4x
195199
{

‎test/CrossVersionTokenValidation.Tests/SamlCrossVersionTokenValidationTests.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ public static TheoryData<CrossTokenVersionTheoryData> CrossVersionSamlTokenTestT
144144
Expires = expires,
145145
Issuer = Default.Issuer,
146146
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
147+
#pragma warning disable 0618
147148
Subject = new ClaimsIdentity(Default.SamlClaims)
149+
#pragma warning restore 0618
148150
},
149151
ValidationParameters4x = new TokenValidationParameters4x
150152
{
@@ -194,7 +196,9 @@ public static TheoryData<CrossTokenVersionTheoryData> CrossVersionSamlTokenTestT
194196
Expires = expires,
195197
Issuer = Default.Issuer,
196198
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
199+
#pragma warning disable 0618
197200
Subject = new ClaimsIdentity(Default.SamlClaims)
201+
#pragma warning restore 0618
198202
},
199203
ValidationParameters4x = new TokenValidationParameters4x
200204
{

‎test/Microsoft.IdentityModel.JsonWebTokens.Tests/JsonWebTokenHandlerTests.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ public static TheoryData<CreateTokenTheoryData> CreateJWETheoryData
126126
{
127127
SigningCredentials = KeyingMaterial.JsonWebKeyRsa256SigningCredentials,
128128
EncryptingCredentials = KeyingMaterial.DefaultSymmetricEncryptingCreds_Aes256_Sha512_512,
129+
#pragma warning disable 0618
129130
Subject = new ClaimsIdentity(Default.PayloadClaims),
131+
#pragma warning restore 0618
130132
},
131133
JsonWebTokenHandler = new JsonWebTokenHandler(),
132134
JwtSecurityTokenHandler = tokenHandler,
@@ -392,7 +394,9 @@ public static TheoryData<CreateTokenTheoryData> CreateJWSTheoryData
392394
TokenDescriptor = new SecurityTokenDescriptor
393395
{
394396
SigningCredentials = KeyingMaterial.JsonWebKeyRsa256SigningCredentials,
397+
#pragma warning disable 0618
395398
Subject = new ClaimsIdentity(Default.PayloadClaims)
399+
#pragma warning restore 0618
396400
},
397401
JsonWebTokenHandler = new JsonWebTokenHandler(),
398402
JwtSecurityTokenHandler = tokenHandler,

‎test/Microsoft.IdentityModel.Protocols.WsFederation.Tests/WsFederationMessageTests.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ public static TheoryData<WsFederationMessageTheoryData> WaSignInTheoryData
153153
IssuedAt = Default.IssueInstant,
154154
Issuer = Default.Issuer,
155155
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
156+
#pragma warning disable 0618
156157
Subject = new ClaimsIdentity(Default.SamlClaims)
158+
#pragma warning restore 0618
157159
}
158160
);
159161

@@ -169,7 +171,9 @@ public static TheoryData<WsFederationMessageTheoryData> WaSignInTheoryData
169171
IssuedAt = Default.IssueInstant,
170172
Issuer = Default.Issuer,
171173
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
174+
#pragma warning disable 0618
172175
Subject = new ClaimsIdentity(Default.SamlClaims)
176+
#pragma warning restore 0618
173177
}
174178
);
175179

‎test/Microsoft.IdentityModel.TestUtils/Default.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,9 @@ public static SecurityTokenDescriptor SecurityTokenDescriptor(EncryptingCredenti
695695
IssuedAt = DateTime.UtcNow,
696696
NotBefore = DateTime.UtcNow,
697697
SigningCredentials = signingCredentials,
698+
#pragma warning disable 0618
698699
Subject = claims == null ? ClaimsIdentity : new ClaimsIdentity(claims)
700+
#pragma warning restore 0618
699701
};
700702
}
701703

‎test/Microsoft.IdentityModel.TestUtils/KeyingMaterial.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ public static RsaSecurityKey RsaSecurityKey2
225225
public static byte[] DefaultSymmetricKeyBytes_128 = Convert.FromBase64String(DefaultSymmetricKeyEncoded_128);
226226
public static SymmetricSecurityKey DefaultSymmetricSecurityKey_128 = new SymmetricSecurityKey(DefaultSymmetricKeyBytes_128) { KeyId = "DefaultSymmetricSecurityKey_128" };
227227

228+
public static string DefaultSymmetricKeyEncoded_192 = "hf+ctyfSxzcVMn5B5D+u4It4/HHjnh/E";
229+
public static byte[] DefaultSymmetricKeyBytes_192 = Convert.FromBase64String(DefaultSymmetricKeyEncoded_192);
230+
public static SymmetricSecurityKey DefaultSymmetricSecurityKey_192 = new SymmetricSecurityKey(DefaultSymmetricKeyBytes_192) { KeyId = "DefaultSymmetricSecurityKey_192" };
231+
228232
public static string DefaultSymmetricKeyEncoded_256 = "Vbxq2mlbGJw8XH+ZoYBnUHmHga8/o/IduvU/Tht70iE=";
229233
public static byte[] DefaultSymmetricKeyBytes_256 = Convert.FromBase64String(DefaultSymmetricKeyEncoded_256);
230234
public static SymmetricSecurityKey DefaultSymmetricSecurityKey_256 = new SymmetricSecurityKey(DefaultSymmetricKeyBytes_256) { KeyId = "DefaultSymmetricSecurityKey_256" };

‎test/Microsoft.IdentityModel.Tokens.Saml.Tests/Saml2SecurityTokenHandlerTests.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,9 @@ public static TheoryData<Saml2TheoryData> RoundTripTokenTheoryData
346346
Audience = Default.Audience,
347347
SigningCredentials = Default.AsymmetricSigningCredentials,
348348
Issuer = Default.Issuer,
349+
#pragma warning disable 0618
349350
Subject = Default.ClaimsIdentity
351+
#pragma warning restore 0618
350352
},
351353
ValidationParameters = new TokenValidationParameters
352354
{
@@ -364,7 +366,9 @@ public static TheoryData<Saml2TheoryData> RoundTripTokenTheoryData
364366
Audience = Default.Audience,
365367
SigningCredentials = KeyingMaterial.RsaSigningCreds_2048,
366368
Issuer = Default.Issuer,
369+
#pragma warning disable 0618
367370
Subject = Default.ClaimsIdentity
371+
#pragma warning restore 0618
368372
},
369373
ValidationParameters = new TokenValidationParameters
370374
{
@@ -382,7 +386,9 @@ public static TheoryData<Saml2TheoryData> RoundTripTokenTheoryData
382386
Audience = Default.Audience,
383387
SigningCredentials = KeyingMaterial.RsaSigningCreds_2048_FromRsa,
384388
Issuer = Default.Issuer,
389+
#pragma warning disable 0618
385390
Subject = Default.ClaimsIdentity
391+
#pragma warning restore 0618
386392
},
387393
ValidationParameters = new TokenValidationParameters
388394
{
@@ -400,7 +406,9 @@ public static TheoryData<Saml2TheoryData> RoundTripTokenTheoryData
400406
Audience = Default.Audience,
401407
SigningCredentials = KeyingMaterial.JsonWebKeyRsa256SigningCredentials,
402408
Issuer = Default.Issuer,
409+
#pragma warning disable 0618
403410
Subject = Default.ClaimsIdentity
411+
#pragma warning restore 0618
404412
},
405413
ValidationParameters = new TokenValidationParameters
406414
{
@@ -419,7 +427,9 @@ public void RoundTripActor(Saml2TheoryData theoryData)
419427
CompareContext context = new CompareContext($"{this}.RoundTripActor, {theoryData}");
420428

421429
var handler = theoryData.Handler as Saml2SecurityTokenHandlerPublic;
430+
#pragma warning disable 0618
422431
var actor = handler.CreateActorStringPublic(theoryData.TokenDescriptor.Subject);
432+
#pragma warning restore 0618
423433
}
424434

425435
[Theory, MemberData(nameof(WriteTokenTheoryData))]
@@ -469,7 +479,9 @@ public static TheoryData<Saml2TheoryData> WriteTokenTheoryData
469479
Expires = Default.Expires,
470480
Issuer = Default.Issuer,
471481
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
482+
#pragma warning disable 0618
472483
Subject = new ClaimsIdentity(Default.SamlClaims)
484+
#pragma warning restore 0618
473485
};
474486

475487
var tokenDescriptorWithPreSharedEncryptingCredentials = new SecurityTokenDescriptor
@@ -479,7 +491,9 @@ public static TheoryData<Saml2TheoryData> WriteTokenTheoryData
479491
Expires = Default.Expires,
480492
Issuer = Default.Issuer,
481493
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
494+
#pragma warning disable 0618
482495
Subject = new ClaimsIdentity(Default.SamlClaims)
496+
#pragma warning restore 0618
483497
};
484498

485499
var tokenDescriptorWithEncryptingCredentials = new SecurityTokenDescriptor
@@ -489,7 +503,9 @@ public static TheoryData<Saml2TheoryData> WriteTokenTheoryData
489503
Expires = Default.Expires,
490504
Issuer = Default.Issuer,
491505
SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
506+
#pragma warning disable 0618
492507
Subject = new ClaimsIdentity(Default.SamlClaims)
508+
#pragma warning restore 0618
493509
};
494510

495511
var validationParameters = new TokenValidationParameters
@@ -626,7 +642,9 @@ public static TheoryData<Saml2TheoryData> RoundTripActorTheoryData
626642
TestId = nameof(ClaimSets.DefaultClaimsIdentity),
627643
TokenDescriptor = new SecurityTokenDescriptor
628644
{
645+
#pragma warning disable 0618
629646
Subject = ClaimSets.DefaultClaimsIdentity
647+
#pragma warning restore 0618
630648
}
631649
}
632650
};
@@ -646,7 +664,9 @@ public void SetDefaultTimesOnTokenCreation()
646664
Issuer = Default.Issuer,
647665
Audience = Default.Audience,
648666
SigningCredentials = Default.AsymmetricSigningCredentials,
667+
#pragma warning disable 0618
649668
Subject = new ClaimsIdentity()
669+
#pragma warning restore 0618
650670
};
651671

652672
var token = tokenHandler.CreateToken(descriptorNoTimeValues);
@@ -1783,7 +1803,9 @@ public static TheoryData<Saml2TheoryData> RoundTripEncryptedTokenTheoryData
17831803
Issuer = Default.Issuer,
17841804
EncryptingCredentials = new X509EncryptingCredentials(KeyingMaterial.DefaultCert_2048), // encrypt with 'one-time-use' session key and wrap a session key using public cert
17851805
SigningCredentials = new SigningCredentials(signingKey, SecurityAlgorithms.RsaSha256Signature, SecurityAlgorithms.Sha256Digest),
1806+
#pragma warning disable 0618
17861807
Subject = new ClaimsIdentity(Default.SamlClaims)
1808+
#pragma warning restore 0618
17871809
};
17881810

17891811
var tokenHandler = new Saml2SecurityTokenHandler();
@@ -1878,7 +1900,9 @@ private static SecurityTokenDescriptor CreateTokenDescriptor(SigningCredentials
18781900
Issuer = Default.Issuer,
18791901
SigningCredentials = signingCredentials,
18801902
EncryptingCredentials = encryptingCredentials,
1903+
#pragma warning disable 0618
18811904
Subject = new ClaimsIdentity(Default.SamlClaims),
1905+
#pragma warning restore 0618
18821906
};
18831907
}
18841908

0 commit comments

Comments
 (0)