move descriptor to metadata project

samisq · Apr 11, 2020 · 851a263 · 851a263
1 parent a9ba25f
commit 851a263
Show file tree

Hide file tree

Showing 48 changed files with 5,846 additions and 5,859 deletions.
diff --git a/Sustainsys.Saml2.Metadata/AdditionalMetadataLocation.cs b/Sustainsys.Saml2.Metadata/AdditionalMetadataLocation.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Sustainsys.Saml2.Metadata
+{
+    public class AdditionalMetadataLocation
+    {
+        public Uri Uri { get; set; }
+        public string Namespace { get; set; }
+    }
+}
diff --git a/Sustainsys.Saml2/Metadata/CipherData.cs → Sustainsys.Saml2.Metadata/CipherData.cs b/Sustainsys.Saml2/Metadata/CipherData.cs → Sustainsys.Saml2.Metadata/CipherData.cs
diff --git a/Sustainsys.Saml2/Metadata/CipherReference.cs → Sustainsys.Saml2.Metadata/CipherReference.cs b/Sustainsys.Saml2/Metadata/CipherReference.cs → Sustainsys.Saml2.Metadata/CipherReference.cs
diff --git a/...ainsys.Saml2/Metadata/ConstrainedValue.cs → ...ainsys.Saml2.Metadata/ConstrainedValue.cs b/...ainsys.Saml2/Metadata/ConstrainedValue.cs → ...ainsys.Saml2.Metadata/ConstrainedValue.cs
diff --git a/...s.Saml2/Metadata/AffiliationDescriptor.cs → ...data/Descriptors/AffiliationDescriptor.cs b/...s.Saml2/Metadata/AffiliationDescriptor.cs → ...data/Descriptors/AffiliationDescriptor.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Xml;
-using Sustainsys.Saml2.Metadata.Descriptors;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class AffiliationDescriptor : ICachedMetadata
     {

diff --git a/.../Metadata/ApplicationServiceDescriptor.cs → ...scriptors/ApplicationServiceDescriptor.cs b/.../Metadata/ApplicationServiceDescriptor.cs → ...scriptors/ApplicationServiceDescriptor.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Text;
-using System.Security.Claims;
+using System.Collections.Generic;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class ApplicationServiceDescriptor : WebServiceDescriptor
 	{

diff --git a/.../Metadata/AttributeAuthorityDescriptor.cs → ...scriptors/AttributeAuthorityDescriptor.cs b/.../Metadata/AttributeAuthorityDescriptor.cs → ...scriptors/AttributeAuthorityDescriptor.cs
@@ -1,11 +1,9 @@
-using Microsoft.IdentityModel.Tokens.Saml2;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
+using Microsoft.IdentityModel.Tokens.Saml2;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 #if FALSE
 	public class SamlAttribute

diff --git a/...aml2/Metadata/AuthnAuthorityDescriptor.cs → ...a/Descriptors/AuthnAuthorityDescriptor.cs b/...aml2/Metadata/AuthnAuthorityDescriptor.cs → ...a/Descriptors/AuthnAuthorityDescriptor.cs
@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class AuthnAuthorityDescriptor : RoleDescriptor
 	{

diff --git a/...nsys.Saml2/Metadata/EntitiesDescriptor.cs → ...etadata/Descriptors/EntitiesDescriptor.cs b/...nsys.Saml2/Metadata/EntitiesDescriptor.cs → ...etadata/Descriptors/EntitiesDescriptor.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Xml;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public class EntitiesDescriptor : MetadataBase, ICachedMetadata
     {

diff --git a/...ainsys.Saml2/Metadata/EntityDescriptor.cs → ....Metadata/Descriptors/EntityDescriptor.cs b/...ainsys.Saml2/Metadata/EntityDescriptor.cs → ....Metadata/Descriptors/EntityDescriptor.cs
@@ -3,7 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Xml;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public class EntityDescriptor : MetadataBase, ICachedMetadata
     {

diff --git a/...ainsys.Saml2/Metadata/IdpSsoDescriptor.cs → ....Metadata/Descriptors/IdpSsoDescriptor.cs b/...ainsys.Saml2/Metadata/IdpSsoDescriptor.cs → ....Metadata/Descriptors/IdpSsoDescriptor.cs
@@ -1,9 +1,9 @@
-using Microsoft.IdentityModel.Tokens.Saml2;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Microsoft.IdentityModel.Tokens.Saml2;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class IdpSsoDescriptor : SsoDescriptor
     {

diff --git a/Sustainsys.Saml2/Metadata/PDPDescriptor.cs → ...ml2.Metadata/Descriptors/PDPDescriptor.cs b/Sustainsys.Saml2/Metadata/PDPDescriptor.cs → ...ml2.Metadata/Descriptors/PDPDescriptor.cs
@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public class PDPDescriptor : RoleDescriptor
     {

diff --git a/Sustainsys.Saml2/Metadata/RoleDescriptor.cs → ...l2.Metadata/Descriptors/RoleDescriptor.cs b/Sustainsys.Saml2/Metadata/RoleDescriptor.cs → ...l2.Metadata/Descriptors/RoleDescriptor.cs
@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Xml;
-using Sustainsys.Saml2.Metadata.Descriptors;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public abstract class RoleDescriptor : ICachedMetadata
     {

diff --git a/...etadata/SecurityTokenServiceDescriptor.cs → ...riptors/SecurityTokenServiceDescriptor.cs b/...etadata/SecurityTokenServiceDescriptor.cs → ...riptors/SecurityTokenServiceDescriptor.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Text;
+using System.Collections.ObjectModel;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public class SecurityTokenServiceDescriptor : WebServiceDescriptor
     {

diff --git a/Sustainsys.Saml2/Metadata/SpSsoDescriptor.cs → ...2.Metadata/Descriptors/SpSsoDescriptor.cs b/Sustainsys.Saml2/Metadata/SpSsoDescriptor.cs → ...2.Metadata/Descriptors/SpSsoDescriptor.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Xml;
-using Sustainsys.Saml2.Metadata.Services;
+using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class DiscoveryResponse : IndexedEndpoint
 	{

diff --git a/Sustainsys.Saml2/Metadata/SsoDescriptor.cs → ...ml2.Metadata/Descriptors/SsoDescriptor.cs b/Sustainsys.Saml2/Metadata/SsoDescriptor.cs → ...ml2.Metadata/Descriptors/SsoDescriptor.cs
@@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class SsoDescriptor : RoleDescriptor
     {

diff --git a/...ys.Saml2/Metadata/WebServiceDescriptor.cs → ...adata/Descriptors/WebServiceDescriptor.cs b/...ys.Saml2/Metadata/WebServiceDescriptor.cs → ...adata/Descriptors/WebServiceDescriptor.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
 using Sustainsys.Saml2.Metadata.Services;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public abstract class WebServiceDescriptor : RoleDescriptor
 	{

diff --git a/Sustainsys.Saml2.Metadata/DisplayClaim.cs b/Sustainsys.Saml2.Metadata/DisplayClaim.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Xml;
+
+namespace Sustainsys.Saml2.Metadata
+{
+    public class DisplayClaim
+    {
+        public string ClaimType { get; private set; }
+        public string DisplayName { get; set; }
+        public string Description { get; set; }
+        public string DisplayValue { get; set; }
+        public bool? Optional { get; set; }
+        public bool WriteOptionalAttribute { get; set; }
+        public string Value { get; set; }
+        public ICollection<XmlElement> StructuredValue { get; set; }
+        public EncryptedValue EncryptedValue { get; set; }
+        public ConstrainedValue ConstrainedValue { get; set; }
+
+        public DisplayClaim(string claimType)
+        {
+            if (claimType == null)
+            {
+                throw new ArgumentNullException(nameof(claimType));
+            }
+            ClaimType = claimType;
+        }
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/EncryptedData.cs b/Sustainsys.Saml2.Metadata/EncryptedData.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Sustainsys.Saml2.Metadata
+{
+    public class EncryptedData
+    {
+        public string Id { get; set; }
+        public Uri Type { get; set; }
+        public string MimeType { get; set; }
+        public Uri Encoding { get; set; }
+        public XEncEncryptionMethod EncryptionMethod { get; set; }
+        public DSigKeyInfo KeyInfo { get; set; }
+        public CipherData CipherData { get; set; }
+        public EncryptionProperties EncryptionProperties { get; set; }
+    }
+}
diff --git a/Sustainsys.Saml2/Metadata/EncryptedValue.cs → Sustainsys.Saml2.Metadata/EncryptedValue.cs b/Sustainsys.Saml2/Metadata/EncryptedValue.cs → Sustainsys.Saml2.Metadata/EncryptedValue.cs
diff --git a/...ys.Saml2/Metadata/EncryptionProperties.cs → ...ys.Saml2.Metadata/EncryptionProperties.cs b/...ys.Saml2/Metadata/EncryptionProperties.cs → ...ys.Saml2.Metadata/EncryptionProperties.cs
diff --git a/...nsys.Saml2/Metadata/EncryptionProperty.cs → ...nsys.Saml2.Metadata/EncryptionProperty.cs b/...nsys.Saml2/Metadata/EncryptionProperty.cs → ...nsys.Saml2.Metadata/EncryptionProperty.cs
diff --git a/Sustainsys.Saml2.Metadata/Helpers/ContactTypeHelpers.cs b/Sustainsys.Saml2.Metadata/Helpers/ContactTypeHelpers.cs
@@ -0,0 +1,61 @@
+using System;
+
+namespace Sustainsys.Saml2.Metadata.Helpers
+{
+    public static class ContactTypeHelpers
+    {
+        public static ContactType Parse(string contactType)
+        {
+            if (contactType == null)
+            {
+                throw new ArgumentNullException(nameof(contactType));
+            }
+
+            switch (contactType)
+            {
+                case "technical":
+                    return ContactType.Technical;
+
+                case "support":
+                    return ContactType.Support;
+
+                case "administrative":
+                    return ContactType.Administrative;
+
+                case "billing":
+                    return ContactType.Billing;
+
+                case "other":
+                    return ContactType.Other;
+
+                default:
+                    throw new FormatException($"Unknown contactType value '{contactType}'");
+            }
+        }
+
+        public static string ToString(ContactType contactType)
+        {
+            switch (contactType)
+            {
+                case ContactType.Technical:
+                    return "technical";
+
+                case ContactType.Support:
+                    return "support";
+
+                case ContactType.Administrative:
+                    return "administrative";
+
+                case ContactType.Billing:
+                    return "billing";
+
+                case ContactType.Other:
+                    return "other";
+
+                default:
+                    throw new InvalidOperationException(
+                        $"Unknown ContactType enumeration value {contactType}");
+            }
+        }
+    }
+}
diff --git a/Sustainsys.Saml2/Metadata/MetadataBase.cs → Sustainsys.Saml2.Metadata/MetadataBase.cs b/Sustainsys.Saml2/Metadata/MetadataBase.cs → Sustainsys.Saml2.Metadata/MetadataBase.cs
diff --git a/Sustainsys.Saml2.Metadata/Sustainsys.Saml2.Metadata.csproj b/Sustainsys.Saml2.Metadata/Sustainsys.Saml2.Metadata.csproj
@@ -23,4 +23,8 @@
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Serialization\" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ys.Saml2/Metadata/XEncEncryptionMethod.cs → ...ys.Saml2.Metadata/XEncEncryptionMethod.cs b/...ys.Saml2/Metadata/XEncEncryptionMethod.cs → ...ys.Saml2.Metadata/XEncEncryptionMethod.cs
diff --git a/Sustainsys.Saml2.StubIdp/CertificateHelper.cs b/Sustainsys.Saml2.StubIdp/CertificateHelper.cs
@@ -6,6 +6,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography.Xml;
 using System.Web;
+using Sustainsys.Saml2.Metadata.Descriptors;
 
 namespace Sustainsys.Saml2.StubIdp
 {

diff --git a/Sustainsys.Saml2.StubIdp/Models/MetadataModel.cs b/Sustainsys.Saml2.StubIdp/Models/MetadataModel.cs
@@ -1,13 +1,10 @@
 using Sustainsys.Saml2.Metadata;
+using Sustainsys.Saml2.Metadata.Descriptors;
+using Sustainsys.Saml2.Metadata.Services;
 using Sustainsys.Saml2.WebSso;
 using System;
-using System.Collections.Generic;
-using System.IdentityModel.Metadata;
-using System.Linq;
-using System.Web;
-using Sustainsys.Saml2.Metadata.Services;
-using EntitiesDescriptor = Sustainsys.Saml2.Metadata.EntitiesDescriptor;
-using EntityDescriptor = Sustainsys.Saml2.Metadata.EntityDescriptor;
+using EntitiesDescriptor = Sustainsys.Saml2.Metadata.Descriptors.EntitiesDescriptor;
+using EntityDescriptor = Sustainsys.Saml2.Metadata.Descriptors.EntityDescriptor;
 
 namespace Sustainsys.Saml2.StubIdp.Models
 {
@@ -22,7 +19,7 @@ public static EntityDescriptor CreateIdpMetadata(bool includeCacheDuration = tru
 
             if (includeCacheDuration)
             {
-				metadata.CacheDuration = new XsdDuration(minutes: 15);
+                metadata.CacheDuration = new XsdDuration(minutes: 15);
                 metadata.ValidUntil = DateTime.UtcNow.AddDays(1);
             }
 
@@ -68,10 +65,10 @@ public static EntityDescriptor CreateIdpMetadata(bool includeCacheDuration = tru
 
         public static EntitiesDescriptor CreateFederationMetadata()
         {
-			var metadata = new EntitiesDescriptor
-			{
-				Name = "Sustainsys.Saml2.StubIdp Federation",
-				CacheDuration = new XsdDuration(minutes: 15),
+            var metadata = new EntitiesDescriptor
+            {
+                Name = "Sustainsys.Saml2.StubIdp Federation",
+                CacheDuration = new XsdDuration(minutes: 15),
                 ValidUntil = DateTime.UtcNow.AddDays(1)
             };
 

diff --git a/Sustainsys.Saml2/Configuration/Saml2Notifications.cs b/Sustainsys.Saml2/Configuration/Saml2Notifications.cs
@@ -7,6 +7,7 @@
 using System.Security.Claims;
 using System.Xml;
 using System.Xml.Linq;
+using Sustainsys.Saml2.Metadata.Descriptors;
 
 namespace Sustainsys.Saml2.Configuration
 {