Merge fix for RoleDescriptor parser bug

Sustainsys · Sep 26, 2018 · bac24c9 · bac24c9
2 parents 4901dc5 + c7ddceb
commit bac24c9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Sustainsys.Saml2/Metadata/MetadataSerializer.cs b/Sustainsys.Saml2/Metadata/MetadataSerializer.cs
@@ -1990,14 +1990,14 @@ protected virtual EntityDescriptor ReadEntityDescriptor(XmlReader reader, Securi
 			{
 				if (reader.IsStartElement("RoleDescriptor", Saml2MetadataNs))
 				{
-					string xsi = reader.GetAttribute("xsi", XsiNs);
-					int colonPos = xsi.IndexOf(':');
+					string xsiType = reader.GetAttribute("type", XsiNs);
+					int colonPos = xsiType.IndexOf(':');
 					if (colonPos < 0)
 					{
-						throw new MetadataSerializationException($"Invalid RoleDescriptor extension type {xsi}");
+						throw new MetadataSerializationException($"Invalid RoleDescriptor extension type {xsiType}");
 					}
-					string extensionNs = reader.LookupNamespace(xsi.Substring(0, colonPos));
-					string extensionType = xsi.Substring(colonPos + 1);
+					string extensionNs = reader.LookupNamespace(xsiType.Substring(0, colonPos));
+					string extensionType = xsiType.Substring(colonPos + 1);
 
 					RoleDescriptor roleDescriptor = null;
 					if (String.Equals(extensionNs, FedNs, StringComparison.Ordinal))
@@ -2015,7 +2015,7 @@ protected virtual EntityDescriptor ReadEntityDescriptor(XmlReader reader, Securi
 					}
 					if (roleDescriptor == null)
 					{
-						ReadCustomRoleDescriptor(xsi, reader, descriptor);
+						ReadCustomRoleDescriptor(xsiType, reader, descriptor);
 					}
 				}
 				else if (reader.IsStartElement("IDPSSODescriptor", Saml2MetadataNs))