registrationAuthority added to all xml files in swamid-2.0/

xml files normalized, the same way later done during generation om
metadata streams (namespaces, cleaning etc)

1 files changed, 16 insertions, 13 deletions

diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index 99b8a027..cf41c832 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.umu.se/adfs/services/trust">
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.umu.se/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
     <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
     </attr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet.</mdui:Description>
@@ -23,7 +26,7 @@
         <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
         <mdui:Keywords xml:lang="en">umu umea+universitet umea+universitet umea+university umea+university umea umea</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>umu.se</mdui:DomainHint>
         <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
         <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
@@ -52,7 +55,7 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Umeå universitet</OrganizationName>
     <OrganizationName xml:lang="en">Umea University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Umeå universitet</OrganizationDisplayName>
@@ -60,27 +63,27 @@
     <OrganizationURL xml:lang="sv">https://www.umu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">https://www.umu.se/en</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="support">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>UmU Incident Response Team</GivenName>
     <EmailAddress>mailto:abuse@umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>