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

4 files changed, 155 insertions, 12 deletions

diff --git a/swamid-2.0/disposer.c3se.chalmers.se.xml b/swamid-2.0/disposer.c3se.chalmers.se.xml
index 630921ce..362ce2c6 100644
--- a/swamid-2.0/disposer.c3se.chalmers.se.xml
+++ b/swamid-2.0/disposer.c3se.chalmers.se.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" 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://disposer.c3se.chalmers.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-14T10:14:25Z">
@@ -21,8 +17,7 @@ and do *NOT* provide it in real time to your partners.
     <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>
@@ -35,6 +30,8 @@ and do *NOT* provide it in real time to your partners.
         <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:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -83,4 +80,24 @@ o/agI+HB5oEGJQGKjPQGnNTpng==
     <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:Organization>
+    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/kth-graylog.cnaas.sunet.se.xml b/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
new file mode 100644
index 00000000..2e91f580
--- /dev/null
+++ b/swamid-2.0/kth-graylog.cnaas.sunet.se.xml
@@ -0,0 +1,108 @@
+<?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://kth-graylog.cnaas.sunet.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-22T10:22:24Z">
+      <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="http://localhost:8080/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="http://localhost:8080/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">CnaaS KTH Graylog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CnaaS KTH Graylog</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Loggsystem för CnaaS på KTH.</mdui:Description>
+        <mdui:Description xml:lang="en">Logging system for CnaaS at KTH.</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://kth-graylog.cnaas.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=https://kth-graylog.cnaas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUcV5WSPAOY5fqR9/9lyrpBtfoUX0wDQYJKoZIhvcNAQEL
+BQAwLTErMCkGA1UEAxMiaHR0cHM6Ly9rdGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5z
+ZTAeFw0yMTA5MjExMzIxMzBaFw0zMTA5MTkxMzIxMzBaMC0xKzApBgNVBAMTImh0
+dHBzOi8va3RoLWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEB
+AQUAA4IBjwAwggGKAoIBgQDPUr257NLpLAU5MIKTenE3pWv10SKZgVqtBUlv/aHc
+ER4yMPQZ7eGDDEDG+h+hrfNvwZG/2++hQD0uTeRcnmae3yFpS7CADv1lRxa3Bo4y
+4dIKVjI9N13v0GSESTkuwv1sLww0LZVyOOXEStGHBv0Y4eySUuWloZ2iurQlByd6
+qmbfUwaLDij3YGiySm01R0rv7T7pCLZjxM9HBipYjLAUqZiLb4Wuh16H5nOlHLLU
+psAWU+PnzP44WjBUfYwToOf7It9uAtNqZQjbBXwhFgoEeBVIAtvDBbL4UXti0nIU
+vYWUT7beirIlkr8TLBfTshzirBtyowa+UtSIeyBl8pjLX4FQc308Ryqiq/bIy9an
+wYMYqHkxJh7aVkHl8jXyymz0furVKWU07YwaZHFKjxLgMXz0JGiO4KrO3QGTDOlQ
+pkbLjkxjue64D01I5YNiSrGoRRQKAMU04fkBLfIaXoOUBdxClWaNIRD3otB5F9up
+mKNb8IUmL2ZhIZ1rG/mKxhkCAwEAAaNQME4wLQYDVR0RBCYwJIIiaHR0cHM6Ly9r
+dGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQU4XYPZiB+4dUBxcbJ
+xDOSlwMR0towDQYJKoZIhvcNAQELBQADggGBAGvxAFYWE4/rQL2j34AsZGqCFyoN
+MheuQ8cwwo883ZaQzTEeDmUHpOrCDQSqj6S9kSEdNwKWGfK7Avrf7D7USfc6KG9R
+cP/rFjR7G+JNlky1+y+dIZjpK6mJhqiZYVLAbrobH5I7O8mFT5MYGiR2GsAfb8x7
+/Z3iS+fLfSfrjEgb5mpZMLK9WLpziijNQzV5flv08O5TNHlZ+qDYR2gd7vty3jIp
+ArgXJT+cnyxrIHS8xK+SDA7EXO4TXgSaKUwyXxwOtriOCJj85v6qm/jK/khpiRV+
+7ViHsZvjmhBpZB3pqV9SqCSe1fbz4L33izokxUzqTkSLh2LeG9P1H92Ub0WLr95L
+ra3Y3sqZtwkRQH0c2QW0WGXwsVLRACK9OCX87shM+4QxvxMrgjaJYjh/hmC86iHw
+5RJtQ7RUyU3ccqJKNQwdb+NoUA/9xMINAv43WmIzwMq9X7WYChomm4yRBOARW4OI
+/r4Qd4D/5JvQpwAGHFkYi4YUkFSqH6ca7xMKQA==
+</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="http://localhost:8080/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://localhost:8080/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://localhost:8080/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost:8080/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://localhost:8080/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost:8080/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Cnaas KTH Graylog</md:ServiceName>
+      <md:ServiceName xml:lang="en">Cnaas KTH 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: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/supr.snic.se.xml b/swamid-2.0/supr.snic.se.xml
index 87f5cf4c..bd03993f 100644
--- a/swamid-2.0/supr.snic.se.xml
+++ b/swamid-2.0/supr.snic.se.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" 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://supr.snic.se">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-11-14T10:14:25Z">
@@ -21,8 +17,7 @@ and do *NOT* provide it in real time to your partners.
     <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>
@@ -35,6 +30,8 @@ and do *NOT* provide it in real time to your partners.
         <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:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -84,4 +81,24 @@ m9Ea0VNPPWBYZkyQ68fOqw==
     <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:Organization>
+    <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Support SUPR</md:SurName>
+    <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index c39ab276..6150f343 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -699,4 +699,5 @@
   <xi:include href="swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/kth-graylog.cnaas.sunet.se.xml"/>
 </md:EntitiesDescriptor>