Merge branch 'master' of md-master.swamid.se:swamid-metadata

6 files changed, 88 insertions, 10 deletions

diff --git a/swamid-2.0/edumeta.sae.kau.se.xml b/swamid-2.0/edumeta.sae.kau.se.xml
new file mode 100644
index 00000000..e76d6bc0
--- /dev/null
+++ b/swamid-2.0/edumeta.sae.kau.se.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edumeta.sae.kau.se">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edumeta.sae.kau.se/Shibboleth.sso/DS/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edumeta.sae.kau.se/Shibboleth.sso/DS/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>edumeta.sae.kau.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edumeta.sae.kau.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAKeQQeJWZN0eMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmVkdW1ldGEuc2FlLmthdS5zZTAeFw0xNjA3MTQwOTE3NTFaFw0yNjA3MTIw
+OTE3NTFaMB0xGzAZBgNVBAMTEmVkdW1ldGEuc2FlLmthdS5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANbjMhIlUINEfLieH4dql6Wx9TPMio1AfzRA
+hRoW1RSwled9oWrEKSl0zof5WIaWB1YnTPmWfzTxTI2oNuhcJ+orZHf1YReOA62/
+DSCG+sJmblba4jt8j4o/IXtDNnMQ9Pjd302u9OP+4oTtrTTy4X0ak8GUadPJiGNk
+sgIPcRNdDoDbSZctuOemgqVUYA9CguVU55UjFFdZKbwi5pEMnY2gvqsWkxJpR1zs
+kMP0aWuNgynQW3M2XmQDW9dS5a4ADrMONzaslMnsshXXFZ8QP4aw9khmpu4km86P
+9D6xqrQRGRM/F1mO3WFWGWfiS6orJPY0Vmz0bcVErHNh+Ftek2kCAwEAAaNAMD4w
+HQYDVR0RBBYwFIISZWR1bWV0YS5zYWUua2F1LnNlMB0GA1UdDgQWBBSaylCoO5OC
+6oVFG7CZcUyFFSVJpzANBgkqhkiG9w0BAQUFAAOCAQEAqy5Vx1H6SlexaldI/POK
+E8UL6NDx6bKQ4pqyzOGd2YouBDR96trhK5KN3wcJPaEnzs4D2DCzfQ5pJC6bFCjU
+U0uEp1MWNs3WOWxwYSB67pYBZxOiXGUY9ubpJvY8uqmd0deviCV2rE2033/2oQNk
+jCrm4wsVhb3XVEgI5b+2r/Yz3eQjChWaHQuNg+gh3OL2zvge+YVQ8AsamX4L5LW7
+wDR/7XVc2u+2vDHIU3RzfMV8GZiWMalbRtljHcC/mXh8rsKFvpTWyHCVr4DHZfFE
+OLRT54JzsUQo1oPa/Q0YUOVkJuxBYGHT4Niv825LWmYB0DyW0OxS0NUptHOlXs/F
+cg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edumeta.sae.kau.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edumeta.sae.kau.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edumeta.sae.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth-sso.xml b/swamid-2.0/indico.uu.se-shibboleth-sso.xml
index 94523672..b0b380c6 100644
--- a/swamid-2.0/indico.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth-sso.xml
@@ -5,10 +5,11 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Indico - new</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico - new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
         <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,4 +45,9 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Wiberg</md:SurName>
+    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 267c55d3..2a586734 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uuc-web003-t.its.uu.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -33,10 +29,11 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Indico TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
         <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo height="52" width="196">https://uuc-web003-t.its.uu.se/images/logo_indico.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -89,4 +86,9 @@ R+DVLFswqfvJvRRyTA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Wiberg</md:SurName>
+    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/www4.kau.se-isp.xml b/swamid-2.0/www4.kau.se-isp.xml
index e55d3a7a..c35fe37b 100644
--- a/swamid-2.0/www4.kau.se-isp.xml
+++ b/swamid-2.0/www4.kau.se-isp.xml
@@ -8,7 +8,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Individuella studieplaner för doktorander</mdui:DisplayName>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index a4a5a197..cc66403e 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,5 +16,4 @@
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/indico.uu.se-shibboleth-sso.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0dcaeecb..f52e5f29 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -626,4 +626,6 @@
   <xi:include href="swamid-2.0/test.account.hj.se.xml"/>
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/indico.uu.se-shibboleth-sso.xml"/>
+  <xi:include href="swamid-2.0/edumeta.sae.kau.se.xml"/>
 </md:EntitiesDescriptor>