Updated blender.c3se.chalmers.se added disposer.c3se.chalmers.se and supr.snic.se

4 files changed, 172 insertions, 1 deletions

diff --git a/swamid-2.0/blender.c3se.chalmers.se-a.xml b/swamid-2.0/blender.c3se.chalmers.se-a.xml
index 3440c1af..a462249e 100644
--- a/swamid-2.0/blender.c3se.chalmers.se-a.xml
+++ b/swamid-2.0/blender.c3se.chalmers.se-a.xml
@@ -27,7 +27,7 @@
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">SUPR testserver Blender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">SUPR test server Blender</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testserver (Bleder) för SNIC User and Project Repository (SUPR).</mdui:Description>
+        <mdui:Description xml:lang="sv">Testserver (Blender) för SNIC User and Project Repository (SUPR).</mdui:Description>
         <mdui:Description xml:lang="en">Test server (Blender) for the SNIC User and Project Repository (SUPR).</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
diff --git a/swamid-2.0/disposer.c3se.chalmers.se.xml b/swamid-2.0/disposer.c3se.chalmers.se.xml
new file mode 100644
index 00000000..27eea817
--- /dev/null
+++ b/swamid-2.0/disposer.c3se.chalmers.se.xml
@@ -0,0 +1,84 @@
+<?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://disposer.c3se.chalmers.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#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/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://disposer.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://disposer.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SUPR testserver Disposer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUPR test server Disposer</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testserver (Disposer) för SNIC User and Project Repository (SUPR).</mdui:Description>
+        <mdui:Description xml:lang="en">Test server (Disposer) for the SNIC User and Project Repository (SUPR).</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>disposer</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=disposer</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3zCCAcegAwIBAgIJAJpQNd54W1WpMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMTCGRpc3Bvc2VyMB4XDTE0MTExMzA5NTI0MVoXDTI0MTExMDA5NTI0MVowEzER
+MA8GA1UEAxMIZGlzcG9zZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC+y5uIuslZ8w+FzuKwwmmkbpGkQVeryBrlb01ZhxRLlI/uB/H5/SYuSkWOIwmh
+bXBmd1wE8qlgx50PC+XZOdDNMY1vV/gva6MUQagU9rztDcpAQcm/sIoO+ocvdLiC
+5x/JfAPSwbA/5OyCRYIYR+LjFgZNC0q3sMtxAtsdQjP7dOK0D8JRRNGpCTJHgCPa
+dLjhau0NRmvUhEfaHS05zbKETZUte3ZTmPxKrrc8GwOEMyGu4TWOQyRT02SHEOjL
+gSMrek+gsjXxKz6jrxUVW1spz+F2eArUXrStQlvJT9gOjmFEep0jGCoXcq10QG+h
++WvvuamBes8B8QpsdIkYXOLHAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGRpc3Bvc2Vy
+MB0GA1UdDgQWBBSzVONP+mikveeZyi4aTBJzi6aqFDANBgkqhkiG9w0BAQUFAAOC
+AQEAHsiX3kB2IDsp15WOq7nWLPhLOJvTMQoKi3mEJ5gKkCzuUHHoulw8HoJFKKYJ
+Cq5sf8d5WG6AJCLuofs87/qtu9AdLjWuQXfhIgdTKrW951sXTIg605dmucR1N//Z
+9WESsxzk9PVQwbEU6SKhLJKRXx4/EmfPHKYTnWEwWr3mzr93a0Xk9Hr7UJsViK1q
+JiXD3ClfD1XQBL7fH9QglS8Wmxkj4KhLZY6ski0dOGF6LeZY/FDMrXiExOgLK9uH
+H9JEriBZP+KVDFZ1U6rKdISQcDUMZLSZmEiVLmqBeWY6XNYGy6SbLM23iyjIe2FH
+o/agI+HB5oEGJQGKjPQGnNTpng==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://disposer.c3se.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://disposer.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/supr.snic.se.xml b/swamid-2.0/supr.snic.se.xml
new file mode 100644
index 00000000..ca4ebbec
--- /dev/null
+++ b/swamid-2.0/supr.snic.se.xml
@@ -0,0 +1,85 @@
+<?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://supr.snic.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#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/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://supr.snic.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://supr.snic.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SUPR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUPR</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SNIC User and Project Repository (SUPR)</mdui:Description>
+        <mdui:Description xml:lang="en">SNIC User and Project Repository (SUPR)</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>messer.c3se.chalmers.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=messer.c3se.chalmers.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJ5kq+e+PrCNMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF21lc3Nlci5jM3NlLmNoYWxtZXJzLnNlMB4XDTE0MTExMzEwMTQwNVoXDTI0
+MTExMDEwMTQwNVowIjEgMB4GA1UEAxMXbWVzc2VyLmMzc2UuY2hhbG1lcnMuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCerDdofc8oW+/HTymS5b3e
+mP6PtgKgqOIfFFAZEgyevWuK5tgKattfc/3SFZgkV6Mtd1itIQHZ4+apbtH9fV2u
+ocapBjN46GHx5hf5Dy9vq+UcUtpbtAWM6mHL6q5y5lAb2DlmVbnRaVZuwIDiP1y8
+LHaIV5ZBI689px+Ch/BqMONfBFh+qZqTeaZm2MvP5/ndIqz8Ylzu9ew4f+9xRntN
+GFRRygaSH4CaP8ymhgd4P0ldY7DWYvU12GRZMisREH97NxfDhRGpZhcOjQANZDxX
+hTZuSNw4jSe6lUFJ059vb2T3ea2BkWtgEBwXCwT6HUrO+KbIzGNfA4IMtTKvqi7J
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF21lc3Nlci5jM3NlLmNoYWxtZXJzLnNlMB0G
+A1UdDgQWBBRiuvyLJNhRdxc009bfL6t4d1M6hDANBgkqhkiG9w0BAQUFAAOCAQEA
+FnyDmtBQhFIuOms1F8JslP3HaKtzAdQ5jjhzMH/W0UZIsnKaT+dU1+qOKbjS5GiY
+sdBZDa4dAqweL85Ycl+TF/03rYz0qC+YOq9YDd2QNAM7IdOiBGxCX5zaoha5elgR
+YY/jrujN0MpCgdXdZTbRxbKakQ5CUxBGaSoLE5Z46sAeqXlZrh+zxLtzADdMV2tc
+MoJW1wvwyQA08K1nGonNmkFGrFEiqQ6+JuM0KPnR3Rq/Z4BOl4VoTAYaRT6EyPEx
+pGuv7RK02oChLjhdGhzSuVXSbt1DthnmATOjO4kWAS3aPmOZC3jQunXmWb0NjO/l
+m9Ea0VNPPWBYZkyQ68fOqw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://supr.snic.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://supr.snic.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://supr.snic.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://supr.snic.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://supr.snic.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://supr.snic.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://supr.snic.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://supr.snic.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://supr.snic.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://supr.snic.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9a407944..3d70a83e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -327,4 +327,6 @@
   <xi:include href="swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml"/>
   <xi:include href="swamid-2.0/service.projectplace.com-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/tentaadmin.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/disposer.c3se.chalmers.se.xml"/>
+  <xi:include href="swamid-2.0/supr.snic.se.xml"/>
 </md:EntitiesDescriptor>