Version 4.6.0-beta1 with support for Saml2AuthnRequest Conditions.

Revsgaard · Revsgaard · commit 9f9895d3e38e · 2021-05-03T15:51:07.000+02:00
diff --git a/src/ITfoxtec.Identity.Saml2.Mvc/ITfoxtec.Identity.Saml2.Mvc.csproj b/src/ITfoxtec.Identity.Saml2.Mvc/ITfoxtec.Identity.Saml2.Mvc.csproj
@@ -14,10 +14,10 @@
     <PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) and Relying Party (RP) Authentication Metadata OIOSAML NemLog-in ASP.NET MVC</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.6.0.0</AssemblyVersion>
+    <FileVersion>4.6.0.0</FileVersion>
     <Copyright>Copyright © 2021</Copyright>
-    <Version>4.5.2</Version>
+    <Version>4.6.0-beta1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
diff --git a/src/ITfoxtec.Identity.Saml2.MvcCore/ITfoxtec.Identity.Saml2.MvcCore.csproj b/src/ITfoxtec.Identity.Saml2.MvcCore/ITfoxtec.Identity.Saml2.MvcCore.csproj
@@ -16,10 +16,10 @@
     <PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) Relying Party (RP) Authentication Metadata OIOSAML NemLog-in ASP.NET MVC Core</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.6.0.0</AssemblyVersion>
+    <FileVersion>4.6.0.0</FileVersion>
     <Copyright>Copyright © 2021</Copyright>
-    <Version>4.5.2</Version>
+    <Version>4.6.0-beta1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
diff --git a/src/ITfoxtec.Identity.Saml2/ITfoxtec.Identity.Saml2.csproj b/src/ITfoxtec.Identity.Saml2/ITfoxtec.Identity.Saml2.csproj
@@ -23,10 +23,10 @@ Tested for compliance with AD FS, Azure AD and Azure AD B2C. Furthermore, the Da
     <PackageTags>SAML SAML 2.0 SAML2.0 SAML2 SAML 2 SAML-P SAMLP SSO Identity Provider (IdP) Relying Party (RP) Authentication Metadata OIOSAML NemLog-in</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageIconUrl>https://itfoxtec.com/favicon.ico</PackageIconUrl>
-    <AssemblyVersion>4.5.2.0</AssemblyVersion>
-    <FileVersion>4.5.2.0</FileVersion>
+    <AssemblyVersion>4.6.0.0</AssemblyVersion>
+    <FileVersion>4.6.0.0</FileVersion>
     <Copyright>Copyright © 2021</Copyright>
-    <Version>4.5.2</Version>
+    <Version>4.6.0-beta1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ITfoxtec.SAML2.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
diff --git a/src/ITfoxtec.Identity.Saml2/Schemas/Condition.cs b/src/ITfoxtec.Identity.Saml2/Schemas/Condition.cs
@@ -16,7 +16,7 @@ public class Condition
         /// </summary>
         public const string elementName = Saml2Constants.Message.Conditions;
 
-        public List<ConditionAbstract> Items { get; set; }
+        public List<ICondition> Items { get; set; }
 
         public DateTimeOffset? NotOnOrAfter { get; set; }
 
@@ -36,17 +36,14 @@ protected virtual IEnumerable<XObject> GetXContent()
             yield return new XAttribute(Saml2Constants.AssertionNamespaceNameX, Saml2Constants.AssertionNamespaceX);
             if (NotOnOrAfter.HasValue)
             {
-                yield return new XAttribute(Saml2Constants.Message.NotOnOrAfter,
-                    NotOnOrAfter.Value.UtcDateTime.ToString(Schemas.Saml2Constants.DateTimeFormat,
-                        CultureInfo.InvariantCulture));
+                yield return new XAttribute(Saml2Constants.Message.NotOnOrAfter, NotOnOrAfter.Value.UtcDateTime.ToString(Saml2Constants.DateTimeFormat, CultureInfo.InvariantCulture));
             }
 
             if (NotBefore.HasValue)
             {
-                yield return new XAttribute(Saml2Constants.Message.NotBefore,
-                    NotBefore.Value.UtcDateTime.ToString(Schemas.Saml2Constants.DateTimeFormat,
-                        CultureInfo.InvariantCulture));
+                yield return new XAttribute(Saml2Constants.Message.NotBefore, NotBefore.Value.UtcDateTime.ToString(Saml2Constants.DateTimeFormat, CultureInfo.InvariantCulture));
             }
+
             if (Items != null)
             {
                 foreach (var condition in Items)
diff --git a/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/AudienceRestriction.cs b/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/AudienceRestriction.cs
@@ -3,7 +3,7 @@
 
 namespace ITfoxtec.Identity.Saml2.Schemas.Conditions
 {
-    public class AudienceRestriction : ConditionAbstract
+    public class AudienceRestriction : ICondition
     {
         /// <summary>
         /// The XML Element name of this class
@@ -12,7 +12,7 @@ public class AudienceRestriction : ConditionAbstract
 
         public List<Audience> Audiences { get; set; }
 
-        public override XElement ToXElement()
+        public XElement ToXElement()
         {
             var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);
 
diff --git a/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/ICondition.cs b/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/ICondition.cs
@@ -2,8 +2,8 @@
 
 namespace ITfoxtec.Identity.Saml2.Schemas.Conditions
 {
-    public abstract class ConditionAbstract
+    public interface ICondition
     {
-        public abstract XElement ToXElement();
+        XElement ToXElement();
     }
 }
diff --git a/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/OneTimeUse.cs b/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/OneTimeUse.cs
@@ -1,17 +1,15 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
+﻿using System.Xml.Linq;
 
 namespace ITfoxtec.Identity.Saml2.Schemas.Conditions
 {
-    public class OneTimeUse : ConditionAbstract
+    public class OneTimeUse : ICondition
     {
         /// <summary>
         /// The XML Element name of this class
         /// </summary>
         const string elementName = Saml2Constants.Message.OneTimeUse;
 
-        public override XElement ToXElement()
+        public XElement ToXElement()
         {
             var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);
 
diff --git a/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/ProxyRestriction.cs b/src/ITfoxtec.Identity.Saml2/Schemas/Conditions/ProxyRestriction.cs
@@ -3,7 +3,7 @@
 
 namespace ITfoxtec.Identity.Saml2.Schemas.Conditions
 {
-    public class ProxyRestriction : ConditionAbstract
+    public class ProxyRestriction : ICondition
     {
         /// <summary>
         /// The XML Element name of this class
@@ -14,7 +14,7 @@ public class ProxyRestriction : ConditionAbstract
 
         public uint? Count { get; set; }
 
-        public override XElement ToXElement()
+        public XElement ToXElement()
         {
             var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class Condition`
`16`	`16`	`/// </summary>`
`17`	`17`	`public const string elementName = Saml2Constants.Message.Conditions;`
`18`	`18`
`19`		`- public List<ConditionAbstract> Items { get; set; }`
	`19`	`+ public List<ICondition> Items { get; set; }`
`20`	`20`
`21`	`21`	`public DateTimeOffset? NotOnOrAfter { get; set; }`
`22`	`22`
`@@ -36,17 +36,14 @@ protected virtual IEnumerable<XObject> GetXContent()`
`36`	`36`	`yield return new XAttribute(Saml2Constants.AssertionNamespaceNameX, Saml2Constants.AssertionNamespaceX);`
`37`	`37`	`if (NotOnOrAfter.HasValue)`
`38`	`38`	`{`
`39`		`- yield return new XAttribute(Saml2Constants.Message.NotOnOrAfter,`
`40`		`- NotOnOrAfter.Value.UtcDateTime.ToString(Schemas.Saml2Constants.DateTimeFormat,`
`41`		`- CultureInfo.InvariantCulture));`
	`39`	`+ yield return new XAttribute(Saml2Constants.Message.NotOnOrAfter, NotOnOrAfter.Value.UtcDateTime.ToString(Saml2Constants.DateTimeFormat, CultureInfo.InvariantCulture));`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`if (NotBefore.HasValue)`
`45`	`43`	`{`
`46`		`- yield return new XAttribute(Saml2Constants.Message.NotBefore,`
`47`		`- NotBefore.Value.UtcDateTime.ToString(Schemas.Saml2Constants.DateTimeFormat,`
`48`		`- CultureInfo.InvariantCulture));`
	`44`	`+ yield return new XAttribute(Saml2Constants.Message.NotBefore, NotBefore.Value.UtcDateTime.ToString(Saml2Constants.DateTimeFormat, CultureInfo.InvariantCulture));`
`49`	`45`	`}`
	`46`	`+`
`50`	`47`	`if (Items != null)`
`51`	`48`	`{`
`52`	`49`	`foreach (var condition in Items)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace ITfoxtec.Identity.Saml2.Schemas.Conditions`
`5`	`5`	`{`
`6`		`- public class AudienceRestriction : ConditionAbstract`
	`6`	`+ public class AudienceRestriction : ICondition`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// The XML Element name of this class`
`@@ -12,7 +12,7 @@ public class AudienceRestriction : ConditionAbstract`
`12`	`12`
`13`	`13`	`public List<Audience> Audiences { get; set; }`
`14`	`14`
`15`		`- public override XElement ToXElement()`
	`15`	`+ public XElement ToXElement()`
`16`	`16`	`{`
`17`	`17`	`var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace ITfoxtec.Identity.Saml2.Schemas.Conditions`
`4`	`4`	`{`
`5`		`- public abstract class ConditionAbstract`
	`5`	`+ public interface ICondition`
`6`	`6`	`{`
`7`		`- public abstract XElement ToXElement();`
	`7`	`+ XElement ToXElement();`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,15 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Xml.Linq;`
	`1`	`+using System.Xml.Linq;`
`4`	`2`
`5`	`3`	`namespace ITfoxtec.Identity.Saml2.Schemas.Conditions`
`6`	`4`	`{`
`7`		`- public class OneTimeUse : ConditionAbstract`
	`5`	`+ public class OneTimeUse : ICondition`
`8`	`6`	`{`
`9`	`7`	`/// <summary>`
`10`	`8`	`/// The XML Element name of this class`
`11`	`9`	`/// </summary>`
`12`	`10`	`const string elementName = Saml2Constants.Message.OneTimeUse;`
`13`	`11`
`14`		`- public override XElement ToXElement()`
	`12`	`+ public XElement ToXElement()`
`15`	`13`	`{`
`16`	`14`	`var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);`
`17`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace ITfoxtec.Identity.Saml2.Schemas.Conditions`
`5`	`5`	`{`
`6`		`- public class ProxyRestriction : ConditionAbstract`
	`6`	`+ public class ProxyRestriction : ICondition`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// The XML Element name of this class`
`@@ -14,7 +14,7 @@ public class ProxyRestriction : ConditionAbstract`
`14`	`14`
`15`	`15`	`public uint? Count { get; set; }`
`16`	`16`
`17`		`- public override XElement ToXElement()`
	`17`	`+ public XElement ToXElement()`
`18`	`18`	`{`
`19`	`19`	`var envelope = new XElement(Saml2Constants.AssertionNamespaceX + elementName);`
`20`	`20`