SWAMID-423 and SWAMID-424

3 files changed, 228 insertions, 0 deletions

diff --git a/swamid-2.0/mdh-graylog.cnaas.sunet.se.xml b/swamid-2.0/mdh-graylog.cnaas.sunet.se.xml
new file mode 100644
index 00000000..5e161bac
--- /dev/null
+++ b/swamid-2.0/mdh-graylog.cnaas.sunet.se.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://mdh-graylog.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-15T08:12:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </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://mdh-graylog.cnaas.sunet.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://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS MDH Graylog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS MDH Graylog</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på MDH.</mdui:Description>
+        <mdui:Description xml:lang="en">Logging system for CnaaS at MDH.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://mdh-graylog.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://mdh-graylog.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUU7dSYEJ7oC4JL4aOFiRbq2ZoGhowDQYJKoZIhvcNAQEL
+BQAwLTErMCkGA1UEAxMiaHR0cHM6Ly9tZGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5z
+ZTAeFw0yMTEwMTIxMTM2MDdaFw0zMTEwMTAxMTM2MDdaMC0xKzApBgNVBAMTImh0
+dHBzOi8vbWRoLWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEB
+AQUAA4IBjwAwggGKAoIBgQDFgLJanmtOtfibM3CtoSVmbkOXoEAi3+htzqeFwT6C
+NWARYWyEcfKGA/xexnIwGSjY1hw0z6pixS12qglRgkJYwBEiYijwJemQCzRxaG0e
+j5KDbXMhmPphZmI5r8EowTM2oxN/NV464geXzwF59Z8uy7IPsSvGIb6tOboifIIm
+52KjZ/rnznVVGxdpZkzfYxAIknEUiMC4YbIT8VU+RIKoxLhsV0VLb30pv++gwdH1
+avQRYgWRwwC1FCU9d961GP2yYCQlfcKmrNoAaB53JF5eDvV6BajGc9qRlylGWUWK
+wGA4mKMJkzo527k93OuyqwqleBfZvPGxJoGP6nr3ShERzUEvhq26hhPlu7woMdjB
+q3cAjJjs0kYyU/0QJ5spGvW1xK0V1s9SZJWaYcltnvs7AwoNP0fCjBmuRbeCqmOu
+xJv8pWDDFji8Cq8WF+j6sFsjootaS9uK5BDmv3Fgwbc6OMXVevwrochN5zdBnDhS
+JBFgHUeO7sEw+0xV6REIdU0CAwEAAaNQME4wLQYDVR0RBCYwJIIiaHR0cHM6Ly9t
+ZGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUzwp2FmE8DuPCkPnS
+LvYKhnNgmr4wDQYJKoZIhvcNAQELBQADggGBADs9krwtFB9fvNAXYOI/X/kOgEpc
+D/yq8EIkTAvkAFyuSPlIpZ2sPhr0tpxFL25Ey/K45J6vn8ZaRXbPp60J9ZhGZuRG
+ugRIfqmbIi+jpPveaWUzZFYBx9/Wuxkxb2diVLcf7PFhaO7iv/CWI5WOzbSqWkjL
+7sbhrSb2pqC8k2L1hxJlGActjMiJRcsUNdqORryqBqtLIDWoG9Tmrz3ZIM+Ho61U
+4Iati7hO6CyuGziDiRmikawhjUOhBOUrOkhG7NODc9bUOkUs8tUda3+bkgEmYaQ7
+yqYeCGNY55Z4d+Agv6rGjdPCGebvihuRMdqSBH+7RKk1pbuUQ6PZ2LMAxeCaXIbk
+Qv28rUmscVhpYIITf69ZzMK4UZcjebVNSYw/WBe09fzYNwgSkTRLD3vc42JoWzKi
+vI0mlpstbP4YAuNQ3vOCP10srjNqoembJE3aWUBMErgDiF4njO1PxECtSFKwl7K4
+mMaPWLQZP56noe1+y1epQf4U39rBvkvOCLGXBg==
+</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://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">CnaaS MDH Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS MDH Graylog</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sunet NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Ernst Widerberg</md:SurName>
+    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/su-graylog.cnaas.sunet.se.xml b/swamid-2.0/su-graylog.cnaas.sunet.se.xml
new file mode 100644
index 00000000..6ee962df
--- /dev/null
+++ b/swamid-2.0/su-graylog.cnaas.sunet.se.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://su-graylog.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-15T08:12:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </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://su-graylog.cnaas.sunet.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://su-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS SU Graylog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS SU Graylog</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på SU.</mdui:Description>
+        <mdui:Description xml:lang="en">Logging system for CnaaS at SU.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>https://su-graylog.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://su-graylog.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIENTCCAp2gAwIBAgIUFX8yrSrxPgBaf13wiStKQ5cwyRwwDQYJKoZIhvcNAQEL
+BQAwLDEqMCgGA1UEAxMhaHR0cHM6Ly9zdS1ncmF5bG9nLmNuYWFzLnN1bmV0LnNl
+MB4XDTIxMTAxMjA4NTIxM1oXDTMxMTAxMDA4NTIxM1owLDEqMCgGA1UEAxMhaHR0
+cHM6Ly9zdS1ncmF5bG9nLmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEF
+AAOCAY8AMIIBigKCAYEAuOwo//TbqD4oFYguV0HimTiLHFDIBe20yQvrm6l9QrYe
+Xjr8bpb4aSfThYRYkER9KPoSBBjjKw5Ez/Ouf+RkHVPedkgsDcbsCZNAGh6shBuZ
+4waiVKsnMvAN15zW+3yKNSFFapUGTNXtoTp4h0yjgxHerEbvcaTfgqdwn5tq7CRS
+7M1NRgzDvAInXr9fbeoVuv8pEjr21u4LMrdB/DGQdUdnHqjc+as5jXI9vRm4K5vE
+1xFUhoG9WdvGn2aumjyfLKZ0BhvJWcU2arOPQlRS54hgVhEMCtv8Qlc0zDf+yOod
+GoceXUPHJKDQoAlqmB2cA+V2CG0vi0B/J1ickbUAJT/LK6PDa4Qr1MEXsF99dy5h
+00+0kywU6bubM49YpGLU7QxdG/mc4zIQKqHO/MO3m3SlTAkk1hzmmEXUdAEd8IJS
+eDsrRNy6dpyemk3sE6cPt3HiyMYjg4B5Q5ZASQxUY/QGaiT2Si1L2lLNOqq2bJYt
+ab8h2G3EUZ091qFb6hMzAgMBAAGjTzBNMCwGA1UdEQQlMCOCIWh0dHBzOi8vc3Ut
+Z3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUxvYdjwEqSuFc622HGyic
+HLKCcrQwDQYJKoZIhvcNAQELBQADggGBAFDfxunfVws8tlI2TF1ymYmcumTrZw11
+9nvTodFiP48x9gZTl/01+mLF9apnziQ0m7mwDwC2dQOm+NxiCz/heSHDt1cNS0vk
+XDOIN+VYrmiu3GJFyufSMAcc4/ubSZNev0VHyKPcty8uAmPvj45TYg6HKwzDcVC+
+5cI5unC2f9RFnIaZqwfBA9Mxiy1Xn+Yg+wv1EuH5CbM37HBgRJih1Fczp57s4+vy
+M+mnHMCLHu7kIVOL1yPmnMLOB8zHs7hlS9fO0r7p5E/qKn7z1nuoFgEmKcCHNsSn
+Qxfghjw3R1BWmkcS/toaYrwSGUa/+X4KR5iFYaGwLeKXx3B+yEzIOTQusDMM3nyv
+uOIdJVlIm7QV39tJFagqBmUJqvSSSTWNH2duTkns1EMqU8nvG+S6+RGillNgMi43
+NFhFdmg6J2IG1SXfgBoqBhW/Bq2j715ie3RlsUyxFEIpFvQ06QJ1qBmCMZsPdg5K
+2mwZRLBhG7Gci2XjTqd4fyuoWM3/5VpM3A==
+</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://su-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">CnaaS SU Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="en">CnaaS SU Graylog</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sunet NOC</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Ernst Widerberg</md:SurName>
+    <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index bbbdc577..948c71b4 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -705,4 +705,6 @@
   <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-idp.its.umu.se-444-proxy-sp-metadata.xml.xml"/>
   <xi:include href="swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml"/>
+  <xi:include href="swamid-2.0/su-graylog.cnaas.sunet.se.xml"/>
+  <xi:include href="swamid-2.0/mdh-graylog.cnaas.sunet.se.xml"/>
 </md:EntitiesDescriptor>