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/fidus-test.skolverket.se-sp.xml b/swamid-2.0/fidus-test.skolverket.se-sp.xml
index f1d9acbf..79deb400 100644
--- a/swamid-2.0/fidus-test.skolverket.se-sp.xml
+++ b/swamid-2.0/fidus-test.skolverket.se-sp.xml
@@ -1,19 +1,22 @@
 <?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#" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://fidus-test.skolverket.se/sp">
-  <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://fidus-test.skolverket.se/sp">
+  <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/hei-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:Extensions>
-      <ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fidus-test.skolverket.se/Saml2SP/disco" index="1"/>
+      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fidus-test.skolverket.se/Saml2SP/disco" index="1"/>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
         <ns1:X509Data>
           <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
 BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
@@ -49,7 +52,7 @@ Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
       </ns1:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo>
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
         <ns1:X509Data>
           <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
 BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
@@ -87,17 +90,17 @@ Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidus-test.skolverket.se/Saml2SP/acs/post" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fidus-test.skolverket.se/Saml2SP/acs/redirect" index="2"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization>
+  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
     <ns0:OrganizationName xml:lang="en">Skolverket</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">Skolverket</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">https://www.skolverket.se</ns0:OrganizationURL>
   </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:GivenName>Technical</ns0:GivenName>
     <ns0:EmailAddress>mailto:daniel.robles@skolverket.se</ns0:EmailAddress>
   </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <ns0:GivenName>Support</ns0:GivenName>
     <ns0:EmailAddress>mailto:daniel.robles@skolverket.se</ns0:EmailAddress>
   </ns0:ContactPerson>
-</ns0:EntityDescriptor>
+</md:EntityDescriptor>