Resolves SWAMID-3140

2 files changed, 170 insertions, 0 deletions

diff --git a/swamid-2.0/client200-180.its.umu.se-shibboleth.xml b/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..b5a89ea9
--- /dev/null
+++ b/swamid-2.0/client200-180.its.umu.se-shibboleth.xml
@@ -0,0 +1,169 @@
+<?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://client200-180.its.umu.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>
+    </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://client200-180.its.umu.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://client200-180.its.umu.se/Shibboleth.sso/Login" 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://client200-180.its.umu.se/Shibboleth.sso/DS/swamid"/>
+      <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://client200-180.its.umu.se/Shibboleth.sso/DS/swamid" 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://client200-180.its.umu.se/Shibboleth.sso/eduid"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Utvecklarmaskin för Tommy Larsson, ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Development workstation for Tommy Larsson, ITS, Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av främst Refeds MFA med ADFS</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Refeds MFA with ADFS</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:KeyName>7540-pd0691.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=7540-pd0691.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIUHnXUDPjwSzrT9M8lDefdpOypIkswDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVNzU0MC1wZDA2OTEuYWQudW11LnNlMB4XDTIwMDYzMDEy
+MDIyNloXDTMwMDYyODEyMDIyNlowIDEeMBwGA1UEAxMVNzU0MC1wZDA2OTEuYWQu
+dW11LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEApoTQYQsSHjx2
+Gxg7zaoZt4Mfuoj+rtCdA8C6aQlncDbBtMycgwzVuEOv+b5kQDROWw9pTDRPWEOq
+F8eR7+PONaFreaUAWr5HYUefBRoMVSe7Gk18vVezBuACiUm+GWU41xQpqicXtizb
+8TWpwg+UzR1EuFGxPFlAqZEwvrIguNUsviPP3ftoa8SLGecwbikcL1FJC/pNghDR
+Wy9hgoXWvHBSbNod5p4hPtDSwU2NnSGC5+Vw30RnZiwtxbG/eTOYlEjZkr0rpC7+
+jbbZep8O+IHBmxPRp4rLJ+NqIhQb2KpZU+WAx/OBfmST9E66pPIbZQwQIYXxpMvv
+aZ/rLm8kVJzklqUjn6P+0zD4UHAbJU3QBuSFnjgOlGPtLkTK1W91iVqzfXOf9Xk2
+5Jd8Vo9C40yFn8cmFkSX2uu/EyFWHuwvxEclqMWRQuYt81rhGe//nUJC7O44DhXA
+sp8PGN4rgUc3zcuZxWDucClRvmFhlzHMZzYgh28+HBJerz1sB/HvAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFTc1NDAtcGQwNjkxLmFkLnVtdS5zZTAdBgNVHQ4EFgQUH3cF
+33o1gneKTvfPCXiSYGtQ6gowDQYJKoZIhvcNAQELBQADggGBAGSuP28w6IssheUv
+/osjFQDdmpNTIqlXIHLHzETzNnST0inBvYKeLZBsZM8nH2qZkWCAAX/F1s3b43zR
+F9GoNiRESK3I4sh+vvaTA9wR96aR/zALhvQwzMmFiOgzxGQP2ruGa3RpNHPt3wGW
+UJO/yr22TxPBCYcTmY4NJ1Qy7TMAuV6NTgHuBQnYkaFBtLMEUlFD9JTPOuocMPBS
+Whu5Z7XbFKBazc5I1u285yPeYW3nw+SLbRPynTE8WIk501IkEDdVpO782CpSDNFb
+jLlEBaz/WWHcY0R5RyerEQegQblM7uwSMA3SNowUCZm1XA5+L8b03zgV4kd8+VwC
+IIcKRd0avcp+5d0nhJp4eZ5KN1fESnFyynbzV0PU5AB2gdYuGmGZpfR6dp4C8KN2
+ijy3tnBPZ5Xpj+KZTBwRT/oVB5ihaMAzZfobc5ZR4uYTRyE/mfpirAhXa417kYm9
+ZK/1vyf5UWo4+cYjf46L9G5mh+yZzdew3Vdf/Am8vf4KjtHKHw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>client200-180.its.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=tommy.larsson@umu.se,CN=client200-180.its.umu.se,OU=Its,O=Umea University,L=umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEHjCCAwagAwIBAgIJAO+6bhtdEJDzMA0GCSqGSIb3DQEBCwUAMIGjMQswCQYD
+VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDAR1bWVhMRgw
+FgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0l0czEhMB8GA1UEAwwY
+Y2xpZW50MjAwLTE4MC5pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0b21teS5s
+YXJzc29uQHVtdS5zZTAeFw0yMDA2MzAxMjA4MjNaFw0yMzA1MTQxMjA4MjNaMIGj
+MQswCQYDVQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDAR1
+bWVhMRgwFgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0l0czEhMB8G
+A1UEAwwYY2xpZW50MjAwLTE4MC5pdHMudW11LnNlMSMwIQYJKoZIhvcNAQkBFhR0
+b21teS5sYXJzc29uQHVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMEQmp0ZyqP2v7SfvMdho7jsc5WjNSnimA58kcArO8EfwR3X9omh2p5JrU2+
+kK6pSi7t/go2RMUrIwh7J5qValnHOXrEcqV1YNdKVoGvpK2TfWbnPux5h9nLZrz7
+F+0qcTARoTXguWT9w1lyMlTXyKeOdBzt/GYn9QQdwsa3R54/0UbLaVrmMmw6Vd+x
+YLV+rgH1NtBgJoOs8T60MR7Dp5uUWsIiwzsg36nES+O4jwLK13QcULT7tHNjnCc9
+W1MobFiRygx1Q9jazu8M2pOYapdpzK/HW0TePUbralH/esE28G6+eyURW4Xn+HKM
+yRUfWWlRKlqJ7xhjiKIT6ep6zMkCAwEAAaNTMFEwHQYDVR0OBBYEFB0Jtm/vVvnu
+lMRVHWeIkP0UhSK3MB8GA1UdIwQYMBaAFB0Jtm/vVvnulMRVHWeIkP0UhSK3MA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAp50pKtGkrMQF9PF1VP
+jkvhVIcl3Y5d2q70Mx93D8WBJQ4SQQe69jrb46a0ibSwaLbB7HF7HQGxp4OyCFws
+fS5j4QzPQ0XadC/IOtImNw//5DeWrg1vfIcpUzZDHvLfJU/oBMoEn8rCAzeTMXb0
+SjwKHVcRVPOoySYkRM5fWua5YtYxwti/C4ImIbzi7GARUb38xYfiG++q1mh4FYXO
+Q675I1jKOy01pMekCFPZLm6D/aRXAKCn2p005ZijSzMpP3ANmmBGNXG+gCUl4AIU
+7ueK0/KDQXTKFbJAmunqMiY1ehllXiWLrJHPtzysbf1eEJRx2W3MOB6DM1I87Ara
+WjY=
+</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:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>7540-pd0691.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=7540-pd0691.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEETCCAnmgAwIBAgIUFwNdviDA0qFT6DIHQc/TVN1PEtEwDQYJKoZIhvcNAQEL
+BQAwIDEeMBwGA1UEAxMVNzU0MC1wZDA2OTEuYWQudW11LnNlMB4XDTIwMDYzMDEy
+MDIyM1oXDTMwMDYyODEyMDIyM1owIDEeMBwGA1UEAxMVNzU0MC1wZDA2OTEuYWQu
+dW11LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA5o8+X/pbOD/J
+Qx6Ahb3vY7rXkWq4GjnUsV2z5lcLzb1PV/OSnKNXNzziFmjypZahjGlgkNmMuy7H
+BAx2C7ZVMBAMNVnaXLXlGlWQRdDayaASSzKHbN2KsRzAMpldnmInTsxqgouuNH+R
+6/AKr0HDTolNqEaUksgxJLNa7nYEulO561JuxufK5j2hl35f+hFZcNci9zAJp8ly
+SeT+b5iofHvP0qK523wIaVE88cNfY3h6k9DdprDlRi/SOWckskZmmcU2KLeuKafv
+ZicVj83Th+5uubBKX+wpbt1+PSnEo91IO9bepimTJo9Hap9gXcsUOVU+jHmrCAvV
+78f/qV7UqTTBoLsqTmCt18IlcAhk+/IhSc3CssIha7aIJRc5JgKkHvfQqm0SSVyM
+G0DCRsDfOyeGGp8vJkcKB7EDH003j9WezOEoX8AP24eZBLoV7kOKxATYkvg5Ev3i
+UsIN1jXQ1X8ulfSyIx6GdF5M2zOULToYepP/oa0uY9gudnEXSoNJAgMBAAGjQzBB
+MCAGA1UdEQQZMBeCFTc1NDAtcGQwNjkxLmFkLnVtdS5zZTAdBgNVHQ4EFgQUWncX
+/nnSTykI2WDmc59SS7elPpEwDQYJKoZIhvcNAQELBQADggGBAFi2HX3vrQ7zzS1J
+KXJDZNrpMiGJ8VZQ2JRMZJGx9G8apte/jBvDryjca4hWXsrVrwoH2mE7meq4QPi+
+/ZVMOFB18kzM9ZTZOnK6QucRejhbUwVvVr3ktJ6goH3Tm9Gajvt9/FrVQ+MJmgJZ
+iQL4S7mBAUlnR662U30ZLWK/i1ekC21RmO9Tp3VAn4cXwqoJXD/SbeYFw9JwamkQ
+UoQLu++ZVOHWRBOdBiDGfxuRP2dwerR4xCmEq8ryGrQR8Y1ebAqi/NdFif18/vtl
+q3BLIFRDJ7Rnu4wa8dKblEqI4LZ1MZkqS6hFc3B9J3J/p/fGHPsuosctHKFJZfQr
+5xsH+EqdH1bV+MVdeBA2T+Uteg4U9rq1vapXnP/tz0tUzSouzwFlhfgJuk4uFSBS
+ZkMjZBIBJGzrwokGpqQBa2vp0LMJzWH3iGZeA2wk+7E9CRG1x6heMUljyUdYgcwM
+QIxISKGBbjrKUow0qO6Ptru7uhELALZOPvwhiS0zbE0V5njQSg==
+</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://client200-180.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-180.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-180.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-180.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://client200-180.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Larsson</md:SurName>
+    <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d37fd438..bd405c31 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -634,4 +634,5 @@
   <xi:include href="swamid-2.0/edusign.ju.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/digkonto-test.ita.chalmers.se.xml"/>
   <xi:include href="swamid-2.0/edusign-test.lu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/client200-180.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>