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

diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index 5c5111a5..1a4548e6 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hkr.se/idp/shibboleth">
-  <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://idp.hkr.se/idp/shibboleth">
+  <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">
       <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>
@@ -10,11 +13,11 @@
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
@@ -24,7 +27,7 @@
         <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>hkr.se</mdui:DomainHint>
         <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
         <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
@@ -68,7 +71,7 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
     </Extensions>
@@ -104,29 +107,29 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">HKR</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hkr.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="technical">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson contactType="support">
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
   </ContactPerson>
-</EntityDescriptor>
+</md:EntityDescriptor>