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

4 files changed, 96 insertions, 0 deletions

diff --git a/swamid-2.0/seminar.nordu.net-shibboleth.xml b/swamid-2.0/seminar.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..9f15aea8
--- /dev/null
+++ b/swamid-2.0/seminar.nordu.net-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://seminar.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"/>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.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://seminar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+      <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://seminar.nordu.net/Shibboleth.sso/Login/feide"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
+      <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://seminar.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
+      <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://seminar.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFjLXcwMS5ub3JkdS5uZXQwHhcNMTUxMTI1MTQzMTMxWhcNMjUxMTIyMTQz
+MTMxWjAbMRkwFwYDVQQDExBhYy13MDEubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm5n/c1jQxsE6ZLDCaLkxAzMkYAveKeF0uMosuZAm
+LbKK88nSMRvrM4XZWUxw4Y7Hhuy4CaI2ief6DEIeCvp1zL1akcRARLKR2dcZwhaI
+Xk5ZmSk0nZFmfCx/Q1/1QkWRtlTWZN5QWjKYhMf8v6NWQUkPkzcnTn5JsFRC53XB
+ZGm4PDxbsj4iHoR+fL78gqcZ/lNlWkico8dF1Gb5ECT7RoFLwYg3j9mJegEueZCd
+zI9xK4J8D1gCv98JhMFDnUuzOsUetKI+ztzgk2kvA4UUXSg5jNQmw4CXXvR4On9F
+zuyrlB7fxfHIUW4+msGDlSIcG4D9fkpgJVggYYfogslzTQIDAQABoz4wPDAbBgNV
+HREEFDASghBhYy13MDEubm9yZHUubmV0MB0GA1UdDgQWBBTSzNfSHtoiM3DkR1ki
+UjaoX4s3KzANBgkqhkiG9w0BAQUFAAOCAQEAkKma/1Q8c9Bfhya5ZjZeVoTD/q0m
+rM+K4C7a88+bEHyIAVi5iKXrGRqcYRxiOFJ90Bqrif5Lu1kXk//WfAoijVVO7LHR
+DstraFrFHnAk+Tqz4hgN7ttzgM63hR9uEe9M5euw00UQ1MTDX2EjUtB22T9m1IPn
+A9ToIGUpGX3izWzTLU+7h2do56ZxbVwH5c+NtQAGEIqDCEbtLvAaWu4XVor8Shj7
+pdi0ryFf9fQWwe8aUhmC8BNl5KNnDMgo3ka39txGyo9bxjJHEHJDwiZNasMgHoCa
+o53aOf7QIMq0SMHnBJXRznGwibXlXP0Wtbl2hpcO5QxiZHziD434b0eYqQ==
+</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://seminar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://seminar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://seminar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 35656002..b313d302 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -21,4 +21,5 @@
   <xi:include href="swamid-2.0/prisma.research.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-t01-p-test.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-t01-t-test.xml"/>
+  <xi:include href="swamid-2.0/seminar.nordu.net-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml
index 650fbc84..0a90f5ab 100644
--- a/swamid-kalmar-1.0.mxml
+++ b/swamid-kalmar-1.0.mxml
@@ -18,4 +18,5 @@
   <xi:include href="swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-saimia-generic-sp.xml"/>
+  <xi:include href="swamid-2.0/seminar.nordu.net-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index bee0baa8..b8946209 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -579,4 +579,5 @@
   <xi:include href="swamid-2.0/ladok3edit.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.ate.grayzone.ladok.se-student-frontend-sp.xml"/>
   <xi:include href="swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+  <xi:include href="swamid-2.0/seminar.nordu.net-shibboleth.xml"/>
 </md:EntitiesDescriptor>