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

2 files changed, 65 insertions, 0 deletions

diff --git a/swamid-2.0/get.eduroam.se.xml b/swamid-2.0/get.eduroam.se.xml
new file mode 100644
index 00000000..564dde8f
--- /dev/null
+++ b/swamid-2.0/get.eduroam.se.xml
@@ -0,0 +1,64 @@
+<?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="get.eduroam.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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://refeds.org/category/research-and-scholarship</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">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">getEduroam</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">getEduroam</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">getEduroam - Eduroam konfiguration</mdui:Description>
+        <mdui:Description xml:lang="en">getEduroam - Eduroam on-boarding</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://get.eduroam.se/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIUbiV0WARdQd12w2KrTWrfqkA36Q4wDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU1VORVQxEDAOBgNVBAsMB0VkdXJvYW0xFzAVBgNVBAMMDmdldC5lZHVyb2FtLnNlMSEwHwYJKoZIhvcNAQkBFhJrcmlzdG9mZXJAc3VuZXQuc2UwHhcNMjEwMzEyMTE1MjI2WhcNMzEwMzEyMTE1MjI2WjCBkzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDEQMA4GA1UECwwHRWR1cm9hbTEXMBUGA1UEAwwOZ2V0LmVkdXJvYW0uc2UxITAfBgkqhkiG9w0BCQEWEmtyaXN0b2ZlckBzdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGiiGceK7BcMSH2cMhvzU9RJLjNeMxM1V30Fe1R1pqr4mBPxa66Mu25nIZjTxlb/XnpD9HcXqW5/DTJmhu+kau1LFbba4sQT1cNBuR02z85QEhVL6L3nAH9LLrbNQOR/6IernSYivfPDyE2i+ekPdhcx3yNg2dwQMVgvMcrqJEruLjPqLPSdjy6I3kYji6dgR+0jGqzSfKHpXN/EkD57UL+QM/pwFCWrJSlOlAB81T+UWWjmMctIR7iLyVIVKd25JW7u1yz0bPv4bbxmfu59luJEjKNw91xsxSFaBTzO7YNyX/OV68NQzzCelTncV/OwFyzXeqcZMarojOtYXI8tGMCAwEAAaNTMFEwHQYDVR0OBBYEFBL2gDO3qBALDrg/5ibRrkzXMcuQMB8GA1UdIwQYMBaAFBL2gDO3qBALDrg/5ibRrkzXMcuQMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF+wl69XaszNLtRriuMvme9+uHUCyofAu1H5x9mjZCxplUMGUFfp8ziszYK/F6tXoQJR2qyir2kByji5F6vOm1pfE/7lkT502ygIAA/CE+coooQ2DI0i3PKW0H63YCs2a9T7tz8YtGGpqs88Aap9H64Zl24syWOqsmxhnEaI3crSxnKKRXrHpEo2U7+ANVVUDJtSxVFPyMSmSqrJq4QMRZplRvp9HaNtXeDyIgblT+tn7TnEc/Mq5kEgNcIk7YZCmja5lcAIerLGtwRt3Uw2ryt0NqqXIyBqHJ2ssy8C+P564a+63xCUU+3JB37awwFjC9LSlwSBu9qM0v8FkSlAG/w=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIUbiV0WARdQd12w2KrTWrfqkA36Q4wDQYJKoZIhvcNAQELBQAwgZMxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEOMAwGA1UECgwFU1VORVQxEDAOBgNVBAsMB0VkdXJvYW0xFzAVBgNVBAMMDmdldC5lZHVyb2FtLnNlMSEwHwYJKoZIhvcNAQkBFhJrcmlzdG9mZXJAc3VuZXQuc2UwHhcNMjEwMzEyMTE1MjI2WhcNMzEwMzEyMTE1MjI2WjCBkzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTVU5FVDEQMA4GA1UECwwHRWR1cm9hbTEXMBUGA1UEAwwOZ2V0LmVkdXJvYW0uc2UxITAfBgkqhkiG9w0BCQEWEmtyaXN0b2ZlckBzdW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGiiGceK7BcMSH2cMhvzU9RJLjNeMxM1V30Fe1R1pqr4mBPxa66Mu25nIZjTxlb/XnpD9HcXqW5/DTJmhu+kau1LFbba4sQT1cNBuR02z85QEhVL6L3nAH9LLrbNQOR/6IernSYivfPDyE2i+ekPdhcx3yNg2dwQMVgvMcrqJEruLjPqLPSdjy6I3kYji6dgR+0jGqzSfKHpXN/EkD57UL+QM/pwFCWrJSlOlAB81T+UWWjmMctIR7iLyVIVKd25JW7u1yz0bPv4bbxmfu59luJEjKNw91xsxSFaBTzO7YNyX/OV68NQzzCelTncV/OwFyzXeqcZMarojOtYXI8tGMCAwEAAaNTMFEwHQYDVR0OBBYEFBL2gDO3qBALDrg/5ibRrkzXMcuQMB8GA1UdIwQYMBaAFBL2gDO3qBALDrg/5ibRrkzXMcuQMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF+wl69XaszNLtRriuMvme9+uHUCyofAu1H5x9mjZCxplUMGUFfp8ziszYK/F6tXoQJR2qyir2kByji5F6vOm1pfE/7lkT502ygIAA/CE+coooQ2DI0i3PKW0H63YCs2a9T7tz8YtGGpqs88Aap9H64Zl24syWOqsmxhnEaI3crSxnKKRXrHpEo2U7+ANVVUDJtSxVFPyMSmSqrJq4QMRZplRvp9HaNtXeDyIgblT+tn7TnEc/Mq5kEgNcIk7YZCmja5lcAIerLGtwRt3Uw2ryt0NqqXIyBqHJ2ssy8C+P564a+63xCUU+3JB37awwFjC9LSlwSBu9qM0v8FkSlAG/w=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://get.eduroam.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">SUNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kristofer Hallin</md:GivenName>
+    <md:EmailAddress>mailto:kristofer@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Sunet NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eduroam</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:operations@eduroam.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9812f7a7..aaa1ccbb 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -689,4 +689,5 @@
   <xi:include href="swamid-2.0/vfu-dev3.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/expert.stage.antagning.se-expert-sp.xml"/>
   <xi:include href="swamid-2.0/expert.stage.antagning.se-hubble-sp.xml"/>
+  <xi:include href="swamid-2.0/get.eduroam.se.xml"/>
 </md:EntitiesDescriptor>