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, 14 insertions, 11 deletions

diff --git a/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
index dc128e52..ee18b159 100644
--- a/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://tsidp1.test.bth.se/idp/shibboleth">
-  <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="https://tsidp1.test.bth.se/idp/shibboleth">
+  <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>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
@@ -10,8 +13,8 @@
         <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
       <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -119,7 +122,7 @@ qW+WsHaRP1g=
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tsidp1.test.bth.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tsidp1.test.bth.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
     </Extensions>
@@ -203,32 +206,32 @@ qW+WsHaRP1g=
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tsidp1.test.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">BTH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (MFA-TEST)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology (MFA-TEST)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="support">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 381500</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>Security Response Team</GivenName>
     <EmailAddress>mailto:abuse@bth.se</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>