Resolved SWAMID-3526

2 files changed, 121 insertions, 0 deletions

diff --git a/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
new file mode 100644
index 00000000..c19a8ced
--- /dev/null
+++ b/swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml
@@ -0,0 +1,120 @@
+<?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://sri.sunet.se/api/saml2/metadata/">
+  <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>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <ns1:DigestMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <ns1:SigningMethod xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+  </md:Extensions>
+  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+    <ns0:Extensions>
+      <ns2:UIInfo xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui">
+        <ns2:DisplayName xml:lang="en">SUNET Relationship Inventory</ns2:DisplayName>
+        <ns2:DisplayName xml:lang="sv">SUNET Relationship Inventory</ns2:DisplayName>
+        <ns2:Description xml:lang="en">Service used for documenting the SUNET relationship</ns2:Description>
+        <ns2:Description xml:lang="sv">T&amp;auml;nst f&amp;ouml;r att dokumentera SUNET relationship</ns2:Description>
+      </ns2:UIInfo>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="signing">
+      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDExMTYxNjA4NDBaFw0zMDExMTQx
+NjA4NDBaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQC6UTEPqy/L524ANXCxEkCE/duGoknk5aBh8r1mJ1AG44+eODKU
+oWYJiED8WSt5r2jnxs5r4hL+kf/NAn1tZXDTixieaNNaCY+k0X7pAoE2Ij6txf+v
+Nq3Lp/4o9irksceb16u19WLXBcWgyfjxBPsvXmrT/NEmRmjbvSkQkjJPH1SZ1M/V
+xzPX0y0bsUE1vdSXSULNB6wFb2d7x+8NV3Bc2rSxaWUGAJ9yzE4rqGHC77xLCbxl
+I6SwuegOqvtkf7pjs9eJvtKDPpMnwFj4+OySW04gaSNpUyXmjz+Ezq0YLIuKPiMe
+WTdIGOC3ajr58jewsV5UyeOpwbNHMUficKzbUoH1K99VKHHsWBSP24hGpUT8m2gn
+k3HVa7uD6v6IgoFyOftiH1xpnjZgp1JorhyrWKid3Hq7a53O4sSY2bgpCFNrs0Lk
+K6DKt7cwGAxIfFPI+ep0CJ7aybILFaj/CA9lW46XIioyfVBogkI4/kHwQWU0Jdjs
+pm+5aw6wm+9WD5+KaRG7uDOI44FZg37jl8+puyXf3nOFwI9iUjTMYR5GycWLg6Il
+KmahI2DQj6j6DrWm2xLjHtSAEFzQtcH7BGYvIBGcoTkjWUXBYt/g/v7mpnWdAvrr
+qZQ1uf0TG9tlNVv6e8Z1kT4fqc03T8Uwp9/C01hXvjelVXGgRPmpF+iQgwIDAQAB
+o1MwUTAdBgNVHQ4EFgQU7G3OuM1+R7rq+adEeV9Bo+EtPnAwHwYDVR0jBBgwFoAU
+7G3OuM1+R7rq+adEeV9Bo+EtPnAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAgEASUgq36xyx6lnQCDSwb9mdoRGn/lMuWXAg407X29oBbYvKiiuePe+
+/vgG0H9J3IzJQMftYJ/J52dhf/po4LTPOpe7FYe4LcyMq/0O4noE7Jukc22RHKVI
+jYYz+zSX5BzFwR68e/91ZJsByQ/Bddxd/jpBlyMwi5n6qTn0Ux2dVk/lVEoXbvth
+z3sOWZcaf6Ta645LCDpl34yAWMloGBOPD5WQ0YoLfeNQxYiQY9v9t/SUICcXl/bc
+RBUwygRF/IZnfKmBKDQ+zQRKR6xqbWjf7F5wK2x82ILzWsgw6q0tgSeiVVktuZbw
+AFap56ElWttQehBsRNJU+GQJUHb+g/L6k/0CZ1XcTzD9K4aPXF6YXmZ1g/YZ9GMx
+pKClIGBAo1JKx3byD1wzt3OaaAFzgzoGHBjofrGt6PXP5z+hypLPdBurVLVZj4jI
+2pG5HdriwEaa0vRaTIrjQ+tz79XJqqVn/posJ3qq6pNcelVcOSS7MJw6B588ZUim
++Sq0xlGA2KdXu9aguOOxz8QUsBWniINMZny5HCq+7QcltZO4jGiJIGHb8j7OysLN
+YziGV7ebnypSquosjPqkymuVZYM7pW1BcUxpNu+fNYHZ7nTt8QGDodWKpV1mvq7J
+u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
+</ns3:X509Certificate>
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="encryption">
+      <ns3:KeyInfo xmlns:ns3="http://www.w3.org/2000/09/xmldsig#">
+        <ns3:X509Data>
+          <ns3:X509Certificate>MIIFBTCCAu2gAwIBAgIUBB21qpvpAcQAgRJi471Il/Fq5RQwDQYJKoZIhvcNAQEL
+BQAwEjEQMA4GA1UEAwwHc3BfYXV0aDAeFw0yMDExMTYxNjA4NDBaFw0zMDExMTQx
+NjA4NDBaMBIxEDAOBgNVBAMMB3NwX2F1dGgwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQC6UTEPqy/L524ANXCxEkCE/duGoknk5aBh8r1mJ1AG44+eODKU
+oWYJiED8WSt5r2jnxs5r4hL+kf/NAn1tZXDTixieaNNaCY+k0X7pAoE2Ij6txf+v
+Nq3Lp/4o9irksceb16u19WLXBcWgyfjxBPsvXmrT/NEmRmjbvSkQkjJPH1SZ1M/V
+xzPX0y0bsUE1vdSXSULNB6wFb2d7x+8NV3Bc2rSxaWUGAJ9yzE4rqGHC77xLCbxl
+I6SwuegOqvtkf7pjs9eJvtKDPpMnwFj4+OySW04gaSNpUyXmjz+Ezq0YLIuKPiMe
+WTdIGOC3ajr58jewsV5UyeOpwbNHMUficKzbUoH1K99VKHHsWBSP24hGpUT8m2gn
+k3HVa7uD6v6IgoFyOftiH1xpnjZgp1JorhyrWKid3Hq7a53O4sSY2bgpCFNrs0Lk
+K6DKt7cwGAxIfFPI+ep0CJ7aybILFaj/CA9lW46XIioyfVBogkI4/kHwQWU0Jdjs
+pm+5aw6wm+9WD5+KaRG7uDOI44FZg37jl8+puyXf3nOFwI9iUjTMYR5GycWLg6Il
+KmahI2DQj6j6DrWm2xLjHtSAEFzQtcH7BGYvIBGcoTkjWUXBYt/g/v7mpnWdAvrr
+qZQ1uf0TG9tlNVv6e8Z1kT4fqc03T8Uwp9/C01hXvjelVXGgRPmpF+iQgwIDAQAB
+o1MwUTAdBgNVHQ4EFgQU7G3OuM1+R7rq+adEeV9Bo+EtPnAwHwYDVR0jBBgwFoAU
+7G3OuM1+R7rq+adEeV9Bo+EtPnAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
+AQsFAAOCAgEASUgq36xyx6lnQCDSwb9mdoRGn/lMuWXAg407X29oBbYvKiiuePe+
+/vgG0H9J3IzJQMftYJ/J52dhf/po4LTPOpe7FYe4LcyMq/0O4noE7Jukc22RHKVI
+jYYz+zSX5BzFwR68e/91ZJsByQ/Bddxd/jpBlyMwi5n6qTn0Ux2dVk/lVEoXbvth
+z3sOWZcaf6Ta645LCDpl34yAWMloGBOPD5WQ0YoLfeNQxYiQY9v9t/SUICcXl/bc
+RBUwygRF/IZnfKmBKDQ+zQRKR6xqbWjf7F5wK2x82ILzWsgw6q0tgSeiVVktuZbw
+AFap56ElWttQehBsRNJU+GQJUHb+g/L6k/0CZ1XcTzD9K4aPXF6YXmZ1g/YZ9GMx
+pKClIGBAo1JKx3byD1wzt3OaaAFzgzoGHBjofrGt6PXP5z+hypLPdBurVLVZj4jI
+2pG5HdriwEaa0vRaTIrjQ+tz79XJqqVn/posJ3qq6pNcelVcOSS7MJw6B588ZUim
++Sq0xlGA2KdXu9aguOOxz8QUsBWniINMZny5HCq+7QcltZO4jGiJIGHb8j7OysLN
+YziGV7ebnypSquosjPqkymuVZYM7pW1BcUxpNu+fNYHZ7nTt8QGDodWKpV1mvq7J
+u2DILJFDHG6NsygDB5HF7t4kMRyVy/xI+dAe80+WmjLKM33ybwW/suk=
+</ns3:X509Certificate>
+        </ns3:X509Data>
+      </ns3:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sri.sunet.se/api/saml2/ls/"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sri.sunet.se/api/saml2/acs/" index="1"/>
+    <ns0:AttributeConsumingService index="1">
+      <ns0:ServiceName xml:lang="en">SUNET Relationship Inventory</ns0:ServiceName>
+      <ns0:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <ns0:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName" isRequired="true"/>
+    </ns0:AttributeConsumingService>
+  </ns0:SPSSODescriptor>
+  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <ns0:Company>SUNET</ns0:Company>
+    <ns0:GivenName>Maria</ns0:GivenName>
+    <ns0:SurName>Haider</ns0:SurName>
+    <ns0:EmailAddress>mailto:mariah@sunet.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7724b488..ca070f87 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -660,4 +660,5 @@
   <xi:include href="swamid-2.0/disp.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml"/>
+  <xi:include href="swamid-2.0/sri.sunet.se-api-saml2-metadata-.xml"/>
 </md:EntitiesDescriptor>