Resolves SWAMIDOPS-227
authorPaul Scott <paul.scott@kau.se>
Tue, 31 Oct 2017 08:39:02 +0000 (09:39 +0100)
committerPaul Scott <paul.scott@kau.se>
Tue, 31 Oct 2017 08:39:02 +0000 (09:39 +0100)
swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
swamid-edugain-idp-1.0.mxml
swamid-idp-2.0.mxml
swamid-testing-sp-1.0.mxml

index 7a0d7e9..a61e1a2 100644 (file)
@@ -6,19 +6,16 @@
         <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:Description xml:lang="sv">Identity Provider för KTH (ny)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH (new)</mdui:Description>
+        <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>
         <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
         <mdui:Logo height="225" width="225">https://saml-5.sys.kth.se/idp/images/logo.png</mdui:Logo>
@@ -138,8 +135,8 @@ jmufPg==
   </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">
index d02e4ec..6306fe2 100644 (file)
@@ -43,8 +43,8 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siths-idp.sunet.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">SITHS Login (via SUNET)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SITHS Login (via SUNET)</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">SITHS Login (SUNET)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SITHS Login (SUNET)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
index d4ac81b..5c809c5 100644 (file)
@@ -6,14 +6,17 @@
         <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)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</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>
@@ -134,8 +137,8 @@ f0LwMg==
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <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:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
index e204f89..8c0b934 100644 (file)
@@ -49,5 +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"/>
+  <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
index 50402ba..d503a3a 100644 (file)
@@ -18,5 +18,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/saml.sys.kth.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
index f4a4d0f..1fe7103 100644 (file)
@@ -44,6 +44,6 @@
   <xi:include href="swamid-2.0/stipendier-test.its.uu.se-stipendium.xml"/>
   <xi:include href="swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/38caledon.ddns.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/s2s.cloudapp.net-Saml2-proxy_saml2_backend.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml-kph-test.xml"/>
+  <xi:include href="swamid-2.0/s2s.cloudapp.net-Saml2-proxy_saml2_backend.xml"/>
 </EntitiesDescriptor>