Resolves SWAMID-3558

2 files changed, 122 insertions, 0 deletions

diff --git a/swamid-2.0/eduvpn.sunet.se-shibboleth.xml b/swamid-2.0/eduvpn.sunet.se-shibboleth.xml
new file mode 100644
index 00000000..adcf0b51
--- /dev/null
+++ b/swamid-2.0/eduvpn.sunet.se-shibboleth.xml
@@ -0,0 +1,121 @@
+<?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://eduvpn.sunet.se/shibboleth">
+  <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://eduvpn.sunet.se/Shibboleth.sso/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://eduvpn.sunet.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">eduVPN SUNET</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduVPN SUNET</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">VPN-tjänst hos SUNET</mdui:Description>
+        <mdui:Description xml:lang="en">VPN-service hosted by SUNET</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.eduvpn.org/about-eduvpn/</mdui:InformationURL>
+        <mdui:Logo height="144" width="144">https://raw.githubusercontent.com/eduvpn/artwork/master/App/App%20icons/eduVPN/app-icon-tile48%403x.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>eduvpn.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=eduvpn.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID/zCCAmegAwIBAgIUQktrGT1/X3mzz6vSBYeVvtgAFG4wDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAxMPZWR1dnBuLnN1bmV0LnNlMB4XDTIwMTEyNTE2MjE1NVoX
+DTMwMTEyMzE2MjE1NVowGjEYMBYGA1UEAxMPZWR1dnBuLnN1bmV0LnNlMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAsZWm/crFqigxFZG5T8G4X76j1Ip7
+rLhG+K8Q24HE9xKu7L2d+EXS1FHaDDu1Xj4hVgZi4WJ7lkhj7VYH9BkOqEw8l5dV
+DAUHCpADO4L1KbfVDVO7f1teaAVsW8zl7HfzXFZIx+5cNWYhfD1/20WOiy9CnHo8
+Dovn5ek2oKLoZ1r/4K/nr2YerZtKConM7P5HEfs597wjjTyDJtvDVthj2ENQDkM1
+1Z2ZY4uEv9O1ceFEHCRDrpCyvn/vonG54DczazZBdwWYaRAwkjijmugEixH3+xhS
+dePhYxrxcPN6uuX2zaYxUMLwJjKJwM61qjHkpnlEi9iNqJpSgjIcJ38hL8tVBeT5
+OlpyAO61jhAnD0WYV/cqquey3rrGk8Z66tK0QmY37/vs5Seu8QnErcz7pkJA/5G8
+rnLuD1b9xDCiqRYxMNJqmx4BxFNYGRDIyb7QN/0WbS49LZ62GKgwcUytn3pz4se1
+gMWi45VglQSarktWyN8PyvPELGSkrrFfFRthAgMBAAGjPTA7MBoGA1UdEQQTMBGC
+D2VkdXZwbi5zdW5ldC5zZTAdBgNVHQ4EFgQUxl2ricPjlncEjojV+oHdfMZtFOow
+DQYJKoZIhvcNAQELBQADggGBAKhcdux5/IKuDmBDVIZxM1VGczOQ91ayXbcWNAfB
+1uMgOzoE3nBGCRzbDx0mUjl+AVbuXzoCrSQkiw0k31pkgd3uQwB+dpQdq41bbaaw
+gXG4d/L3MZdIRaqQGDGHLMrL649MkKgWNleSFLGKe+OYhtKGQ9NOSjg+LWX1Vrip
+pp6T57328cXpkZdJ2IcXvZnoxbHzem25IZtD2PLrjg60Q+udAtXiQBBs+VdhOBZi
+OzdVMC0LqGptKpyyntN5FxnmNMRJK/V5tPm4flSSBhtshZcx34OZq7g99yob407r
+TbhL8G4vDssnDkt3poP6F8pX1l6P1ABJYyNKlabKDZowTNCZuvXPSARm9g75L2ua
+YUubQnjXl9qxyKq3yookPalywqRl9Lio+TU60FYnqlooApKTepVgyS8RE5ZtaEmH
+O6jDyLgtYZFk6t9+4VbE3hprXTITvPm1bDN5YMghP3GMWAPEkr23T1QzS3/12rs1
+yLOQTGGD/mz5L/TujyyoRFib/w==
+</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://eduvpn.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduvpn.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduvpn.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduvpn.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eduvpn.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduvpn.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eduvpn.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eduvpn.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eduvpn.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eduvpn.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber/>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber/>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+    <md:TelephoneNumber/>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ef7b7cdd..eff0c035 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -661,4 +661,5 @@
   <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunid.miun.se-saml-miun-metadata.xml"/>
+  <xi:include href="swamid-2.0/eduvpn.sunet.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>