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, 18 insertions, 13 deletions

diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 9719868f..03bd6f57 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:auth0:safarijv:uppsala-university">
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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="urn:auth0:safarijv:uppsala-university">
+  <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>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">O'Reilly Learning Platform</mdui:DisplayName>
         <mdui:Description xml:lang="en">Use of this SP requires an Enterprise or Academic subscription to the O'Reilly Learning Platform. Please visit https://www.oreilly.com/ for details.</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://www.oreilly.com/online-learning/</mdui:InformationURL>
@@ -10,8 +15,8 @@
         <mdui:Logo xml:lang="en" width="90" height="40">https://cdn.oreillystatic.com/emailsignature/oreilly_email_logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
           <!-- Serial No. 1690942378109942522077, expires on Fri Jan 11 20:48:32 2030 GMT -->
           <ds:X509Certificate>
@@ -35,8 +40,8 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safarijv.auth0.com/logout"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safarijv.auth0.com/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/logout"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safarijv.auth0.com/login/callback?connection=uppsala-university" index="0" isDefault="true"/>
     <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
       <ServiceName xml:lang="en">O'Reilly Learning Platform</ServiceName>
@@ -47,21 +52,21 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
       <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">O'Reilly Media</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Safari Books Online</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.oreilly.com/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Jesse Banning</GivenName>
     <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Jesse Banning</GivenName>
     <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
   </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>Matt Kirk</GivenName>
     <EmailAddress>mailto:security-feedback@oreilly.com</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>