Resolves RT issue 534.

2 files changed, 93 insertions, 0 deletions

diff --git a/swamid-2.0/graylog.sunet.se-shibboleth.xml b/swamid-2.0/graylog.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..1767b0d6
--- /dev/null
+++ b/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -0,0 +1,92 @@
+<!--
+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="_e3eaccda18d31802206ed944048e24f0211786eb" entityID="https://graylog.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"/>
+    <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/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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://graylog.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://graylog.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui=“urn:oasis:names:tc:SAML:metadata:ui”>
+        <mdui:DisplayName xml:lang=“sv”>Graylog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang=“en”>Graylog</mdui:DisplayName>
+        <mdui:Description xml:lang=“sv”>En loggtjänst hos SUNET</mdui:Description>
+        <mdui:Description xml:lang=“en”>A logging service at SUNET</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>graylog.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=graylog.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOjtMxI0lV6PMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGdyYXlsb2cuc3VuZXQuc2UwHhcNMTgwMzA5MTU1MTMyWhcNMjgwMzA2MTU1
+MTMyWjAbMRkwFwYDVQQDExBncmF5bG9nLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAsBaqJP/iLugw4LrKc+RtbWb9OiU6W1r1Mvn6ifXb
+Ws36Cz9SL/GgPOccPppmirk8pFQu64DTa+HbNuzzpgUIjkrJvnnqd3MbpwHRc7aN
+r+JMaLc1s025O0tfOE3nj7oCAfhVCipgZC7asK7QxjG1HG1lR06fHBupzL8uQEQb
+PKeIr/JAHBvlZ5XrOQNPJuoP1wabNR/diig0WB/NePg81/80hAprSBBTweAikG99
+NFrCH2GcRKBrnqjQvCxuD9sqcbGeZXO0bT97TwxKMTGDtlWeLZDTWjXwpW/2v89b
+v1XGYJN+u7bmPwUmR08yPzigVw48aTfD9c0UhESIS24vxwIDAQABoz4wPDAbBgNV
+HREEFDASghBncmF5bG9nLnN1bmV0LnNlMB0GA1UdDgQWBBS8ZSe+qyt5LY3D5IY0
+tQ2LtzziKzANBgkqhkiG9w0BAQUFAAOCAQEAB8nCPwTlBTCExH+5L0OqvPsl7rxI
+J817T6PPf8uhgDIpWCBAlFHyF32G7COCmpsGQJXp2R+rJUlbC79Q3EzjPMKUzmxD
+bkxvt+jLU+HUaLhcjv1URhOjf/bikMeFaYVzTZxUPN2GinQfvGtl7zXvItPOM0+D
+XfHHAag/oq7lu5zIGpdHeieaVls7ZzB3dFmf2M2MBtcM11gjuPIz4GeA70tSbNAy
+ODshQbDdE7k74c1Oy7ej2QXS8RTPc6ifS5BCTB/9iJKuUg60FxbIvPnkb6kwgdUW
+x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
+</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://graylog.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://graylog.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://graylog.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://graylog.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://graylog.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://graylog.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Pettai</md:SurName>
+    <md:EmailAddress>mailto:pettai@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7214b334..a871cba8 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -602,6 +602,7 @@
   <xi:include href="swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml"/>
   <xi:include href="swamid-2.0/student.utb3.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/graylog.nordu.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/graylog.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.utb3.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.verifiering3.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml"/>