Switch KTH IdPs

5 files changed, 24 insertions, 25 deletions

diff --git a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
index bfa0b229..beddfe48 100644
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.it.liu.se/idp/shibboleth">
   <md:Extensions>
-        <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
       <saml:Attribute 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>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
@@ -205,26 +205,25 @@ RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-
-
-
-
-<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">LiU</OrganizationName>
     <OrganizationName xml:lang="en">LiU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
-  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Linköping University</Company>
     <SurName>LiU-IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 4109143b..896899b5 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -1,19 +1,22 @@
 <?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://saml.sys.kth.se/idp/shibboleth">
   <Extensions>
-    <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">
+    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute 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>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml: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">
     <Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
@@ -121,8 +124,8 @@ x7JUFw==</ds:X509Certificate>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
index fdde5df5..d4ac81b2 100644
--- a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
@@ -6,17 +6,14 @@
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <md:Extensions>
       <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (Ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (New)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
@@ -137,8 +134,8 @@ f0LwMg==
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (Ny)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (New)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index cc17b475..e204f893 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -27,7 +27,6 @@
   <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.idp.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kkh.se-idp-shibboleth.xml"/>
@@ -50,4 +49,5 @@
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 620b279a..c3b98d5d 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -19,5 +19,5 @@
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>