Resolves #167: Lägg till SP timesketch.cert.sunet.se i SWAMIDs metadata

4 files changed, 95 insertions, 4 deletions

diff --git a/swamid-2.0/graylog.nordu.net-shibboleth.xml b/swamid-2.0/graylog.nordu.net-shibboleth.xml
index 0915aee6..e25c07d1 100644
--- a/swamid-2.0/graylog.nordu.net-shibboleth.xml
+++ b/swamid-2.0/graylog.nordu.net-shibboleth.xml
@@ -81,4 +81,9 @@ pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/irttools.nordu.net-shibboleth.xml b/swamid-2.0/irttools.nordu.net-shibboleth.xml
index 68ddd32c..b8e281f3 100644
--- a/swamid-2.0/irttools.nordu.net-shibboleth.xml
+++ b/swamid-2.0/irttools.nordu.net-shibboleth.xml
@@ -1,9 +1,9 @@
+<?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" ID="_463d13584a4bcd6ea2c585be943f9a1b51898219" entityID="https://irttools.nordu.net/shibboleth">
-
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://irttools.nordu.net/shibboleth">
   <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"/>
@@ -28,7 +28,6 @@ and do *NOT* provide it in real time to your partners.
       </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://irttools.nordu.net/Shibboleth.sso/Login"/>
@@ -86,5 +85,9 @@ vg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://irttools.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://irttools.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..bff4bca9
--- /dev/null
+++ b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://timesketch.cert.sunet.se/shibboleth">
+  <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 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://timesketch.cert.sunet.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://timesketch.cert.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TimeSketch</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TimeSketch</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Incidenthanteringsverktyg hos SUNET</mdui:Description>
+        <mdui:Description xml:lang="en">Incident Response tool run by SUNET</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>plaso</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=plaso</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIJANyEyNM9Prx5MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+BAMTBXBsYXNvMB4XDTE3MDgyMzEzMTM0NFoXDTI3MDgyMTEzMTM0NFowEDEOMAwG
+A1UEAxMFcGxhc28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtUR7O
+igCzgDhDtuPskPg41x1XzGmBlEerv2YO214BHqLGDBENRvs9OzF3fZTUfiN82Jmo
+yFh6YaRrJT5vgGTg8IGVk37DqePrkkM8zZihlz5qVWVxtZq6OSwbTvHE8J/vBuCi
+MPMXjnBD8PDK80KRfm18g3cx01mtOHYZOi/aTF5MF+GuYWqC+J+L2e7B60IuISw5
+38JVZuhWkskII4ZilWyEFmW85cslvailwnqhzQr7lgWesPz1lAiDNcfKU4x5t4Sa
+8Nl8Av4+rL84udkQ/+D2OHrLh6qkOK1ea3SulK444bd2kUResZ+InL66R03rtkRc
+prjaeJvEfgtv0Zx5AgMBAAGjMzAxMBAGA1UdEQQJMAeCBXBsYXNvMB0GA1UdDgQW
+BBSiIFl0X43hLFeCW9jNZDzHdrCT2jANBgkqhkiG9w0BAQUFAAOCAQEAOwJM7sp1
+Z+aTM48UgQpQN8JZ7H2W9cycJ4MezREkZkB6IhAK13nP5GcbYYUvXI6nndP63ijh
+IFEJNwSwuq8QPNdCjxBD9YRBygRQIAzUrafYuWR9ZW5Yeo2cgyemy5SF93zVPwKJ
+7JL/pjeRY55HsMjwPfDFccFRD/NUa8XGeQYxcMY+uFhL5v0skGpIrO2axyD/mK5n
+nBlzLNawMny+aSwLWKFzEXFn9nzCg0AZoUc/Btvbvk0vhEZRsCc8K3H2LmUC0E/t
+rxVFJn1AwzprTkIucggKKne/zZqq5xbWUQBTne5VkUTUllBmpJNF0ZhCpQsNZnDj
+A4F5+e/ZMR2dTg==
+</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://timesketch.cert.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 91c63577..78693d1d 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -661,4 +661,5 @@
   <xi:include href="swamid-2.0/pptest.hj.se-Shibboleth-sso.xml"/>
   <xi:include href="swamid-2.0/pingpong.ju.se-Shibboleth-sso.xml"/>
   <xi:include href="swamid-2.0/connect.eoppimispalvelut.fi-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>