Update Microsoft.IdentityModel from 7.3.1 to 7.5.1

abc-software · Apr 26, 2024 · b490999 · b490999
1 parent 4e85421
commit b490999
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 43 deletions.
diff --git a/src/Abc.IdentityModel.Metadata/Abc.IdentityModel.Metadata.csproj b/src/Abc.IdentityModel.Metadata/Abc.IdentityModel.Metadata.csproj
@@ -16,7 +16,7 @@
     <Reference Include="System.IdentityModel" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.5.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Abc.IdentityModel.Protocols.EidasLight/Abc.IdentityModel.Protocols.EidasLight.csproj b/src/Abc.IdentityModel.Protocols.EidasLight/Abc.IdentityModel.Protocols.EidasLight.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.5.1" />
     <PackageReference Include="Apache.Ignite" Version="2.16.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
   </ItemGroup>

diff --git a/src/Abc.IdentityModel.Protocols.Saml2/Abc.IdentityModel.Protocols.Saml.csproj b/src/Abc.IdentityModel.Protocols.Saml2/Abc.IdentityModel.Protocols.Saml.csproj
@@ -25,9 +25,9 @@
 
   <ItemGroup>
     <PackageReference Include="Abc.Diagnostics" Version="[1.2.6, 1.3.0)" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.5.1" />
     <!--<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />-->
   </ItemGroup>
 

diff --git a/src/Abc.IdentityModel.Tokens.Jwt/Abc.IdentityModel.Tokens.Jwt.csproj b/src/Abc.IdentityModel.Tokens.Jwt/Abc.IdentityModel.Tokens.Jwt.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Abc.IdentityModel.Tokens.Saml/Abc.IdentityModel.Tokens.Saml.csproj b/src/Abc.IdentityModel.Tokens.Saml/Abc.IdentityModel.Tokens.Saml.csproj
@@ -22,11 +22,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Abc.IdentityModel.Xml/Abc.IdentityModel.Xml.csproj b/src/Abc.IdentityModel.Xml/Abc.IdentityModel.Xml.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.3.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="7.5.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.5.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or  '$(TargetFramework)' == 'net451' Or  '$(TargetFramework)' == 'net461'">

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,7 +6,7 @@
     <Copyright>© ABC software. All rights reserved.</Copyright>
     <Product>Abc.IdentityModel</Product>
     <AssemblyVersion>2.0</AssemblyVersion>
-    <Version>2.1.1-dev01</Version>
+    <Version>2.1.1</Version>
 
     <LangVersion>8.0</LangVersion>
 

diff --git a/...el.Protocols.EidasLight.UnitTests/Abc.IdentityModel.Protocols.EidasLight.UnitTests.csproj b/...el.Protocols.EidasLight.UnitTests/Abc.IdentityModel.Protocols.EidasLight.UnitTests.csproj
@@ -20,17 +20,17 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="FluentAssertions.Analyzers" Version="0.30.0">
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.31.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Abc.IdentityModel.Tokens.Jwt.UnitTests/Abc.IdentityModel.Tokens.Jwt.UnitTests.csproj b/test/Abc.IdentityModel.Tokens.Jwt.UnitTests/Abc.IdentityModel.Tokens.Jwt.UnitTests.csproj
@@ -9,20 +9,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens.Saml" Version="7.5.1" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="FluentAssertions.Analyzers" Version="0.30.0">
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.31.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Abc.IdentityModel.Tokens.Saml.UnitTests.csproj b/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Abc.IdentityModel.Tokens.Saml.UnitTests.csproj
@@ -17,15 +17,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Saml/SamlSecurityTokenHandlerFixture.cs b/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Saml/SamlSecurityTokenHandlerFixture.cs
@@ -96,6 +96,7 @@ public void ReadToken(SamlTheoryData theoryData) {
             }
             catch (Exception ex) when (theoryData.ExpectedException != null) {
                 Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
             }
         }
 
@@ -105,14 +106,14 @@ public static TheoryData<SamlTheoryData> ReadTokenSourceData {
                 new SamlTheoryData {
                     Token = null,
                     XmlReader = XmlUtilities.CreateXmlReader(ReferenceTokens.SamlToken_Valid),
-                    ExpectedException = new ArgumentNullException("token"),
+                    ExpectedException = new ArgumentNullException("", "IDX10000:"),
                     TestId = nameof(ReadToken) + "_" + "Null token",
                 },
 
                 new SamlTheoryData {
                     Token = ReferenceTokens.SamlToken_Valid,
                     XmlReader = null,
-                    ExpectedException = new ArgumentNullException("reader"),
+                    ExpectedException = new ArgumentNullException("", "IDX10000:"),
                     TestId = nameof(ReadToken) + "_" + "Null XmlReader",
                 },
 
@@ -132,6 +133,7 @@ public void ValidateToken(SamlTheoryData theoryData) {
             }
             catch (Exception ex) when (theoryData.ExpectedException != null) {
                 Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
             }
         }
 
@@ -151,14 +153,14 @@ public static TheoryData<SamlTheoryData> ValidateTokenSourceData {
                     new SamlTheoryData {
                         Token = null,
                         ValidationParameters = validationParameters,
-                        ExpectedException = new ArgumentNullException("token"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(ValidateToken) + "_" + "Null-Token",
                     },
 
                     new SamlTheoryData {
                         Token = ReferenceTokens.SamlToken_Valid,
                         ValidationParameters = null,
-                        ExpectedException = new ArgumentNullException("validationParameters"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(ValidateToken) + "_" + "Null-TokenValidationParameters",
                     },
 
@@ -194,6 +196,7 @@ public void ValidateXmlToken(SamlTheoryData theoryData) {
             }
             catch (Exception ex) when (theoryData.ExpectedException != null) {
                 Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
             }
         }
 
@@ -213,21 +216,21 @@ public static TheoryData<SamlTheoryData> ValidateXmlTokenSourceData {
                     new SamlTheoryData {
                         XmlReader = null,
                         ValidationParameters = validationParameters,
-                        ExpectedException = new ArgumentNullException("xmlReader"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(ValidateXmlToken) + "_" + "Null-XmlReader",
                     },
 
                     new SamlTheoryData {
                         XmlReader = XmlUtilities.CreateXmlReader(ReferenceTokens.Saml2Token_Valid),
                         ValidationParameters = validationParameters,
-                        ExpectedException = new Microsoft.IdentityModel.Xml.XmlReadException(),
+                        ExpectedException = new Microsoft.IdentityModel.Xml.XmlReadException("IDX30011:"),
                         TestId = nameof(ValidateXmlToken) + "_" + "InvalidSaml2Token",
                     },
 
                     new SamlTheoryData {
                         XmlReader = XmlUtilities.CreateXmlReader(ReferenceTokens.SamlToken_Valid),
                         ValidationParameters = null,
-                        ExpectedException = new ArgumentNullException("validationParameters"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(ValidateXmlToken) + "_" + "Null-TokenValidationParameters",
                     },
 
@@ -266,6 +269,7 @@ public void WriteToken(SamlTheoryData theoryData) {
             }
             catch (Exception ex) when (theoryData.ExpectedException != null) {
                 Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
             }
         }
 
@@ -296,14 +300,14 @@ public static TheoryData<SamlTheoryData> WriteTokenSourceData {
                     new SamlTheoryData {
                         SecurityToken = null,
                         ValidationParameters = validationParameters,
-                        ExpectedException = new ArgumentNullException("securityToken", "IDX10000:"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(WriteToken) + "_" + "Null securityToken",
                     },
 
                     new SamlTheoryData {
                         SecurityToken = ReferenceJwt.JwtToken,
                         ValidationParameters = validationParameters,
-                        ExpectedException = new ArgumentException("IDX13400:"),
+                        ExpectedException = new ArgumentException("IDX11400:"),
                         TestId = nameof(WriteToken) + "_" + nameof(ReferenceJwt.JwtToken),
                     },
 
@@ -341,6 +345,7 @@ public void WriteTokenXml(SamlTheoryData theoryData) {
             }
             catch (Exception ex) when (theoryData.ExpectedException != null) {
                 Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
             }
         }
 
@@ -363,21 +368,21 @@ public static TheoryData<SamlTheoryData> WriteTokenXmlSourceData {
                     new SamlTheoryData {
                         XmlWriter = XmlDictionaryWriter.CreateTextWriter(new MemoryStream()),
                         SecurityToken = null,
-                        ExpectedException = new ArgumentNullException("securityToken", "IDX10000:"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(WriteTokenXml) + "_" + "Null securityToken",
                     },
 
                     new SamlTheoryData {
                         XmlWriter = null,
                         SecurityToken = ReferenceJwt.JwtToken,
-                        ExpectedException = new ArgumentNullException("writer", "IDX10000:"),
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
                         TestId = nameof(WriteTokenXml) + "_" + "Null XmlWriter",
                     },
 
                     new SamlTheoryData {
                         XmlWriter = XmlDictionaryWriter.CreateTextWriter(new MemoryStream()),
                         SecurityToken = ReferenceJwt.JwtToken,
-                        ExpectedException = new ArgumentException("IDX13150:"),
+                        ExpectedException = new ArgumentException("IDX11400:"),
                         TestId = nameof(WriteTokenXml) + "_" + nameof(ReferenceJwt.JwtToken),
                     },
 
@@ -404,5 +409,66 @@ public static TheoryData<SamlTheoryData> WriteTokenXmlSourceData {
                 return theoryData;
             }
         }
+
+
+        [Theory, MemberData(nameof(CreateAttributeTheoryData))]
+        public void CreateAttribute(SamlTheoryData theoryData) {
+            try {
+                var attribute = (theoryData.Handler as SamlSecurityTokenHandlerPublic).CreateAttributePublic(theoryData.Claim);
+
+                Assert.Equal(attribute.Name, theoryData.SamlAttribute.Name);
+                Assert.Equal(attribute.Namespace, theoryData.SamlAttribute.Namespace);
+                Assert.Equal(attribute.Values, theoryData.SamlAttribute.Values);
+                Assert.Equal(attribute.AttributeValueXsiType, theoryData.SamlAttribute.AttributeValueXsiType);
+                Assert.Equal(attribute.ClaimType, theoryData.SamlAttribute.ClaimType);
+                Assert.Equal(attribute.OriginalIssuer, theoryData.SamlAttribute.OriginalIssuer);
+            }
+            catch (Exception ex) when (theoryData.ExpectedException != null) {
+                Assert.IsType(theoryData.ExpectedException.GetType(), ex);
+                Assert.StartsWith(theoryData.ExpectedException.Message, ex.Message);
+            }
+        }
+
+        public static TheoryData<SamlTheoryData> CreateAttributeTheoryData {
+            get {
+                return new TheoryData<SamlTheoryData>
+                {
+                    new SamlTheoryData
+                    {
+                        ExpectedException = new ArgumentNullException("", "IDX10000:"),
+                        Handler = new SamlSecurityTokenHandlerPublic(),
+                        TestId = nameof(CreateAttribute) + "_" + "Null claim",
+                        Claim = null,
+                    },
+                    new SamlTheoryData
+                    {
+                        ExpectedException = new SamlSecurityTokenException("IDX11523:"),
+                        Handler = new SamlSecurityTokenHandlerPublic(),
+                        TestId = nameof(CreateAttribute) + "_" + "claim type without namespace",
+                        Claim = new Claim("sub", "value"),
+                    },
+                    new SamlTheoryData
+                    {
+                        Handler = new SamlSecurityTokenHandlerPublic(),
+                        TestId = nameof(CreateAttribute),
+                        Claim = new Claim(ClaimTypes.Name, "value", ClaimValueTypes.String),
+                        SamlAttribute = new SamlAttribute("http://schemas.xmlsoap.org/ws/2005/05/identity/claims", "name", "value")
+                    },
+                    new SamlTheoryData
+                    {
+                        Handler = new SamlSecurityTokenHandlerPublic(),
+                        TestId = nameof(CreateAttribute) + "_" + "with OriginalIssuer",
+                        Claim = new Claim(ClaimTypes.Name, "value", ClaimValueTypes.String, null, "issuer"),
+                        SamlAttribute = new SamlAttribute("http://schemas.xmlsoap.org/ws/2005/05/identity/claims", "name", "value") { OriginalIssuer = "issuer" },
+                    },
+                };
+            }
+        }
+
+        private class SamlSecurityTokenHandlerPublic : SamlSecurityTokenHandler {
+            public SamlAttribute CreateAttributePublic(Claim claim) {
+                return base.CreateAttribute(claim);
+            }
+        }
     }
 }
diff --git a/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Saml/SamlTheoryData.cs b/test/Abc.IdentityModel.Tokens.Saml.UnitTests/Saml/SamlTheoryData.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -19,5 +20,9 @@ public SamlTheoryData(TokenTheoryData tokenTheoryData)
         public string InclusiveNamespacesPrefixList { get; set; }
 
         public SamlSerializer SamlSerializer { get; set; } = new SamlSerializer();
+
+        public Claim Claim { get; set; }
+
+        public SamlAttribute SamlAttribute { get; set; }
     }
 }
diff --git a/test/Abc.IdentityModel.Xml.UnitTests/Abc.IdentityModel.Xml.UnitTests.csproj b/test/Abc.IdentityModel.Xml.UnitTests/Abc.IdentityModel.Xml.UnitTests.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.3.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Xml" Version="7.5.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>