Resolves SWAMID-2094

2 files changed, 142 insertions, 0 deletions

diff --git a/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..34a75162
--- /dev/null
+++ b/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://acc.bedomningshandboken.uhr.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 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://acc.bedomningshandboken.uhr.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://acc.bedomningshandboken.uhr.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Bedömningshandboken ACC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bedömningshandboken ACC</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Bedömningshandbokens acceptanstest-miljö.</mdui:Description>
+        <mdui:Description xml:lang="en"> Bedömningshandbokens acceptance test environment</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://acc.bedomningshandboken.uhr.se/om-bedomningshandboken/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://acc.bedomningshandboken.uhr.se/om-bedomningshandboken/personuppgifter2/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="83" width="83"> https://acc.bedomningshandboken.uhr.se/static/gfx/uhr_symbol_lila.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrweb14.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrweb14.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID+jCCAmKgAwIBAgIJAKjjMIlV2h5CMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
+BAMTEXVocndlYjE0LmkudWhyLnNlMB4XDTE4MTEwMjA5NDI0OVoXDTI4MTAzMDA5
+NDI0OVowHDEaMBgGA1UEAxMRdWhyd2ViMTQuaS51aHIuc2UwggGiMA0GCSqGSIb3
+DQEBAQUAA4IBjwAwggGKAoIBgQDF1p7kl8WP5GY71+ushTf3wJTI7jXcHCU/0T8O
+C9TNNU7NAegyUMLfThMfkiA2aPpjTteItun7hEaT+LknonDEXnr8USk4hJGUAp3H
+bJ2VxSoLrZB36wbUwkI6OIzAIHxXfhWb8TRLbpXz0AtSb+HsFx78hqGhAScQS0TI
+LWzhyckWvy0AG0RiGd/b9+m8KyYwk2ikqAFKKX4ccXODTvc8uyTND2ImYN9yXQ1Z
++ChXAgLD9yKsiuQPQarPg1Mt3OIKY1jMXDgWKW4FvgrnlaKEkMHjockX4QKKF7/D
+tr8XuNQHaeoUXblaLdANJuXWTKOFMyxZ5cyk5MdwDdU0f0nCiZ+wSXJeWhwk66Dn
+HyStYxfVeTuChtQHErMUIo+qC3zb8gmc90F4PJsMCcSP8OwrI+nOsx8aOnany6km
+Lad4CgpkmYtTxC+Q3RdzRe/p4wbaOnvy6pispsnMkCzBQ1G2ndG8NIqyNYGYKgWd
+9V9iZJf/VKa23wNgWkL6JxDHEkcCAwEAAaM/MD0wHAYDVR0RBBUwE4IRdWhyd2Vi
+MTQuaS51aHIuc2UwHQYDVR0OBBYEFAV4G9s/OFg4qz5avteNdXN+sblmMA0GCSqG
+SIb3DQEBCwUAA4IBgQBfW7wCRtaJfWsyh/1HKLYm6tM5s+RXTeXeSE3lpwp0JP5j
+eRvP06X8Vr1gJZIkLWiwgwRtKfTC8Tk4lfVzjXePncouHtxi/4bk0qf5lOSGLFYp
+Gw066DDOvHWdvJZFrZV238KOh0QzwxCf7SirsL4KgZZKoiJn9trI29USANS7dali
+/AP9H2JQCvViNKiojFIkhhPgdC6YxGaWDCkI3+0KS3LyiKLoQNgXt0NVWLC2apha
+H2Vd5U3Wem6+GceCkUMa0GwEJDc50jj45rWq1mXj0swofdSn32Pb/xGNyasy2/wI
+/ueMxTe9XdokuLJ094tnch63aT7dALRWBV8WKMe5fp3nt564d5yVFkFBfRKBGobE
+Lm0a8x/Fwc+gD0h3y6cprFlEjPq+1mqBjrkrzHIGCFgQQKPzLg9c1CQoRaE/tT7R
+GJU3Qc762Lt8F1xWTLw8+Bhxo75wjajp4guwTLbygbzXhMkTnO+dSSQT2QP+vmWy
+oUbivgET2z0Zfrcs8ss=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>bedomningshandboken.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=bedomningshandboken.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIICxjCCAa4CCQCKyKhsQJuOvzANBgkqhkiG9w0BAQUFADAlMSMwIQYDVQQDExpi
+ZWRvbW5pbmdzaGFuZGJva2VuLnVoci5zZTAeFw0xMzA0MDQwNzU0MzVaFw0yMzA0
+MDIwNzU0MzVaMCUxIzAhBgNVBAMTGmJlZG9tbmluZ3NoYW5kYm9rZW4udWhyLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzkgQbPG77UHm5R1PUSqa
+RBOWDnSXEtXQriWKg/Rf760O1KOgqnlJ2rRoWjht38sO1/SeAb14KzEiZimO/9v1
+ZJgrV2FEq8zjVPRvYXSmMltzdx8UJ3jbz4SLNcASOnUoay3VxiegNQXAvtM4NP2E
+B+eEvNwr6MuUm2RULVHW2XAXD+TWtf3hSBlVL7fQPHXyngou9nqGmjKOSLpiYk/k
+TK8bPzd3Qh7q5rI3fpj9yGAyGFK5BCF/Fe/isQPk4bf/qv3N1gjR9NHeMDAZ6KVh
+POjzl2qd6h7VjRwWK4cSYB4KA/ERh9CIydnY1oEbK9h96ZmuzageLHiDoZsGnX/8
++wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC4KOo9PINl62jHOjoddC3key+qfFxD
+RIMJkRzDWRtkbEzmNOFdOxzAVZt56Ji8Cot05T7K6x9Vh+pLyeu2uGKT+9V247y1
+hwvA2QW0x8QqjtbUDkm9MEFhInCh3mNGRh9QFskMVK5fZNByXuSIJloQb19pB48D
+whnDlL5OLft7mLy8TGqK7cokIppZ55QnlAHSpuBh6Mm/hcfBBMLTDdj5ydLhV26I
+EGWYSrJbdzVpEMKEE2hlSsuq0rYXH0yk3MHEZbyjeontkh8bJt6PaCCnj817GcnA
+ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
+</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://acc.bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acc.bedomningshandboken.uhr.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Bedömningshandboken ACC</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Bedömningshandboken ACC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Bedömningshandbokens acceptance test environment</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Bedömningshandbokens acceptanstest-miljö.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Eric</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 16084f3f..c4d83933 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -621,4 +621,5 @@
   <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fidus-test.skolverket.se-sp.xml"/>
+  <xi:include href="swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>