From d7aacae3307d0a126ce5ff3cb9087dcd4683317e Mon Sep 17 00:00:00 2001
From: Fredrik Domeij <fredrik.domeij@umu.se>
Date: Wed, 12 Jun 2019 08:15:13 +0200
Subject: 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)
---
 swamid-2.0/adfs2.gu.se-adfs-services-trust.xml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'swamid-2.0/adfs2.gu.se-adfs-services-trust.xml')

diff --git a/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml b/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
index e58ea3a7..2fef11db 100644
--- a/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://ADFS2.gu.se/adfs/services/trust">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="">
+<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://ADFS2.gu.se/adfs/services/trust">
+  <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:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
@@ -30,7 +33,7 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs2.gu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs2.gu.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Göteborgs universitet</OrganizationName>
     <OrganizationName xml:lang="en">University of Gothenburg</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Göteborgs universitet (ADFS)</OrganizationDisplayName>
@@ -38,24 +41,24 @@
     <OrganizationURL xml:lang="sv">http://www.gu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">https://www.gu.se/english/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Gothenburg</Company>
     <SurName>GU SAML admins</SurName>
     <EmailAddress>mailto:gukonto@gu.se</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>University of Gothenburg</Company>
     <SurName>GU SAML admins</SurName>
     <EmailAddress>mailto:gukonto@gu.se</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="support">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>University of Gothenburg</Company>
     <SurName>GU Helpdesk</SurName>
     <EmailAddress>mailto:support@gu.se</EmailAddress>
     <TelephoneNumber>+46 31 786 2020</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>GU Incident Response Team</GivenName>
     <EmailAddress>mailto:irt@gu.se</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>
-- 
cgit v1.2.3