From 8e43cc75708edae39799c53941226a75bd3170f3 Mon Sep 17 00:00:00 2001
From: Einar Lönn <el@sunet.se>
Date: Wed, 9 Oct 2019 12:16:03 +0200
Subject: New meta.eduroam.se server, not fully done yet but fixing shibb now

---
 swamid-2.0/meta2.eduroam.se.xml | 101 ++++++++++++++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml              |   1 +
 2 files changed, 102 insertions(+)
 create mode 100644 swamid-2.0/meta2.eduroam.se.xml

diff --git a/swamid-2.0/meta2.eduroam.se.xml b/swamid-2.0/meta2.eduroam.se.xml
new file mode 100644
index 00000000..ba102e5f
--- /dev/null
+++ b/swamid-2.0/meta2.eduroam.se.xml
@@ -0,0 +1,101 @@
+<?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://meta2.eduroam.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://meta2.eduroam.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://meta2.eduroam.se/Shibboleth.sso/DS/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">eduroam v2.0 meta</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduroam v2.0 meta</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är v2.0 av Sveriges nya eduroam metadata hanteringsverktyg</mdui:Description>
+        <mdui:Description xml:lang="en">This is v2.0 of the new eduroam metadata management system for Sweden</mdui:Description>
+        <mdui:Logo height="115" width="50">https://meta2.eduroam.se/static/img/eduroam_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>meta2.eduroam.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=meta2.eduroam.se</ds:X509SubjectName>
+          <ds:X509Certificate>
+MIIEAjCCAmqgAwIBAgIUOPww09+P5kuBYPavdi22l8cr4TcwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQbWV0YTIuZWR1cm9hbS5zZTAeFw0xOTA5MTYwOTEwMjZa
+Fw0yOTA5MTMwOTEwMjZaMBsxGTAXBgNVBAMTEG1ldGEyLmVkdXJvYW0uc2UwggGi
+MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDQRSDiot0zwNB/xWKHCilF+EUc
+6WIzLI2AihYmzCq1L1G/0rRZjuvOsI8TIvALwdUn4/Sr1AgHUiMniWyvOQ2ygFe8
+jgmjm44HUocuNOCm8+rTmqKvhQyEAf++pc0ElddfBKyg50SjbRpIJqrSVwC6IlMB
+xafEfdLez5BLLg4ePEzFTVWpHcmvpBAo9PbRQNdd4iEg4wUza42id2xKISRzHZJi
+xQjXROh3t37PX/pg6lULl98tME1sFWLBlB0GXJ0oFhXF6SOvyClswNC8LtywMm7W
+8bEXhtvZU+eDi+A9fM/PDTTCdmv6+wF7US+HgPBybv5j1uBJPI4SSbeZKAOquJX4
+tDoydXdFBfvfGaTiUR443Kdv5wCDIumc+fJgAW8xzhQ2uEH+/HK1MGs44uLTsAZH
+wHi651gEvW1eYFNEVj493xEf/OwbNknmo3uMmdKsZN8tekMn2uXcwP78SGe7Oghh
+DMNNS+q9Vho6oXWsAXF9puGTnUkkSWHbIzMTae8CAwEAAaM+MDwwGwYDVR0RBBQw
+EoIQbWV0YTIuZWR1cm9hbS5zZTAdBgNVHQ4EFgQU0Jb9a1JP0OuNoyTC2P4udYQk
+vNIwDQYJKoZIhvcNAQELBQADggGBAC1wMgAOjRpgvADlfeF35jRyHAZ50ZkdQq9F
+fW5flAtEG0Ufih4Tyevom0u9kRx3hxB8AXbNaEvYgzrXtC86/qTVswyT0R9/rVjU
+Wfkwi4MyDX+v1G+PfAbPxZKsOsliONCFXhghP2aoUMSfEsGomHHGjd5AnkE3SpVP
+iGS03Quf35mAlOB75qGlRtgcyptIfbdUIH0jqDvaNIGkxD12Q0BYh2++AZJii2Jg
+v48k9rZvDgb/9aFQJfzoI+cK04di3Xv4sRIw3jy2xa4hSimxM9za8BEf4fU2ghvA
+T+j6tIq2U4x0k6Tu6u+5tQJHLCqJVnJcwz/3/L/eWtzwpDEOqJncmyS6pvW55W9e
+DeNWs+s32eyDNyZGgmND31ZN8oD0MQ+ijT8s7uTQMwvtsERGM/x5TPpyPnJ19cVE
+LufuC1Of1sruFyWdHXkmneHQiwSiPRqqwV9lWvmZESF+n8U0RpU0Bz/gtL++c9Jh
+73mAn5cmNb5G9Oc/Ugf26wqrghnrcw==
+</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://meta2.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta2.eduroam.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta2.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta2.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Scott</md:SurName>
+    <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Anders</md:GivenName>
+    <md:SurName>Nilsson</md:SurName>
+    <md:EmailAddress>mailto:anders.nilsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ecd3ad6c..8f3d06fd 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -135,6 +135,7 @@
   <xi:include href="swamid-2.0/mailfilter.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mds.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/meta.eduroam.se.xml"/>
+  <xi:include href="swamid-2.0/meta2.eduroam.se.xml"/>
   <xi:include href="swamid-2.0/meetingtools.nordu.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.sunet.se.xml"/>
   <xi:include href="swamid-2.0/smd.du.se-shibboleth.xml"/>
-- 
cgit v1.2.3