Resolves SWAMIDOPS-209

3 files changed, 106 insertions, 0 deletions

diff --git a/swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml b/swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml
new file mode 100644
index 00000000..b3a8c0c7
--- /dev/null
+++ b/swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect2.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/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/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://connect2.sunet.se/Shibboleth.sso/Login/idp.funet.fi"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SUNET E-Meeting Service Backup</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SUNET E-mötestjänsten backup miljö</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">SUNET Connect gör det lätt och enkelt att anordna möten, utbildningar och seminarier som alla kan delta på – oavsett var de befinner sig.</mdui:Description>
+        <mdui:Description xml:lang="en">SUNET Connect makes it easy and simple to organize meetings, seminars and seminars that everyone can attend - no matter where they are.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.sunet.se/tjanster/connect/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect2.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=noc@sunet.se,CN=connect2.sunet.se,O=SUNET,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIID6TCCAtGgAwIBAgIJAK50Oh3eerEmMA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
+BAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEaMBgGA1UEAxMRY29ubmVjdDIuc3VuZXQu
+c2UxGzAZBgkqhkiG9w0BCQEWDG5vY0BzdW5ldC5zZTAeFw0xNzA5MTQwNzM0MTJa
+Fw0yNzA5MTIwNzM0MTJaMFYxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKEwVTVU5FVDEa
+MBgGA1UEAxMRY29ubmVjdDIuc3VuZXQuc2UxGzAZBgkqhkiG9w0BCQEWDG5vY0Bz
+dW5ldC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGOBdrkCk6M
+/8F0rfyluEdbiq9J5Sqviai0k5ePZWbm0L04am1A/nUOTa4tMZXZx9450wrNtpwP
+IVaFF3kjh0bOwUpfSvcdKhmFWc9jAJHKnTh2PxLVe2qrNeZn79TZHV1BfKjU+SZ8
+lHjjoOlgzj9NjAnhccXSAlOTKgYRhcHh/0iDG5p6LHnqnYMgmGNrkwlg0lgF6TxE
+lraukHvqlWWuGZfLLfc8bOiapr7h4HlQtuYhCemhsvpFTelP7NbCklVBNwN3DpKc
+2IZCESDQ6NIZU9nQxKG255BeKonT+z9IuxURaDJ1j1nolwrqbFUbAiRJcnmqWowA
+oLSCp2FWm7kCAwEAAaOBuTCBtjAdBgNVHQ4EFgQUM5kSqLgiJ88bSHRs6RcT8Oev
+8A8wgYYGA1UdIwR/MH2AFDOZEqi4IifPG0h0bOkXE/Dnr/APoVqkWDBWMQswCQYD
+VQQGEwJTRTEOMAwGA1UEChMFU1VORVQxGjAYBgNVBAMTEWNvbm5lY3QyLnN1bmV0
+LnNlMRswGQYJKoZIhvcNAQkBFgxub2NAc3VuZXQuc2WCCQCudDod3nqxJjAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCny18oBRCXcfkcHfgxWM5mbJtP
+6wCjpj4FTQPivBgZcW3WxuuKjmJSoqKqzKWzddQMZthpkdS6On0xGIn5wZLXTKtq
+M9StIFEwE4qkuYRKwgsjn9SRMuXkpbOav0rYgyxx1L3FsvKR8rqzBPUp3cDoTQec
+haSm8KdbCE0y705k7q6gf6NPltNOoXUcx3z65ITzdGu1iMFeUnc6gUM0xLLUjRxe
+WjepeAfFouWXq1BM0IoQcZFNRJ4Dr82fJHt6PsVEKidDo7L8vfSRc+8gOp+K41m5
+6U9JHVDpNeVG7He/lbg1qYnbULEcCpZlKEzjYsOvW49ocXobMr/UcL4hpCD9
+</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://connect2.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect2.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect2.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect2.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect2.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect2.sunet.se/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 30cf3747..361e6296 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -33,4 +33,5 @@
   <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 1fb6a5ad..e96402e6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -673,4 +673,5 @@
   <xi:include href="swamid-2.0/cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dev.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/local.cloudmore.com-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/connect2.sunet.se-shibboleth.sso-metadata.xml"/>
 </md:EntitiesDescriptor>