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/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index eb482147..9ee4c04f 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.idp.eduid.se/idp.xml">
-  <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="https://login.idp.eduid.se/idp.xml">
+  <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:attr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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>
@@ -13,11 +16,11 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </attr:EntityAttributes>
-  </ns0:Extensions>
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <ns0:IDPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:Extensions>
-      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <ns1:Scope xmlns:ns1="urn:mace:shibboleth:metadata:1.0" regexp="false">eduid.se</ns1:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
         <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
@@ -33,7 +36,7 @@
       </mdui:UIInfo>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
+      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
         <ns2:X509Data>
           <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
@@ -59,7 +62,7 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
       </ns2:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
+      <ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
         <ns2:X509Data>
           <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
 RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
@@ -92,25 +95,25 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
   </ns0:IDPSSODescriptor>
-  <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="administrative">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>Valter Nordh</ns0:SurName>
     <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
     <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
   </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="technical">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>SUNET eduID team</ns0:SurName>
     <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
   </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>eduID Support</ns0:SurName>
     <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
   </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+</md:EntityDescriptor>