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, 12 insertions, 9 deletions

diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index ab4c7ec0..29d8e140 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" entityID="http://admin-tug-1.eduid.se:6544/saml2/metadata/">
-  <ns0: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://admin-tug-1.eduid.se:6544/saml2/metadata/">
+  <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">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
-  </ns0:Extensions>
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
         <ns1:X509Data>
           <ns1:X509Certificate>MIICujCCAaICCQD+E/TQDMbDSTANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRh
 ZG1pbi10dWctMS5lZHVpZC5zZTAeFw0xMzA0MTcxMzQ0NDFaFw0yMzA0MTUxMzQ0
@@ -32,7 +35,7 @@ iJJZ3BjPM7Q/BJ92X8XQT/47DwhoNQCqHpQzOKiH
       </ns1:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
         <ns1:X509Data>
           <ns1:X509Certificate>MIICujCCAaICCQD+E/TQDMbDSTANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRh
 ZG1pbi10dWctMS5lZHVpZC5zZTAeFw0xMzA0MTcxMzQ0NDFaFw0yMzA0MTUxMzQ0
@@ -56,14 +59,14 @@ iJJZ3BjPM7Q/BJ92X8XQT/47DwhoNQCqHpQzOKiH
     <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://admin-tug-1.eduid.se:6544/saml2/ls/"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://admin-tug-1.eduid.se:6544/saml2/acs/" index="1"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization>
+  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
     <ns0:OrganizationName xml:lang="en">eduID</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">eduID</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.eduid.se</ns0:OrganizationURL>
   </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:Company>eduID</ns0:Company>
     <ns0:GivenName>Sysadmin</ns0:GivenName>
     <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
   </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+</md:EntityDescriptor>