Resolves SWAMIDOPS-979 and SWAMIDOPS-980

3 files changed, 155 insertions, 0 deletions

diff --git a/swamid-2.0/hb.hr.evry.se-shibboleth.xml b/swamid-2.0/hb.hr.evry.se-shibboleth.xml
new file mode 100644
index 00000000..b7000134
--- /dev/null
+++ b/swamid-2.0/hb.hr.evry.se-shibboleth.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hb.hr.evry.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#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/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Primula</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Primula</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula från EVRY HR Solutions AB för anställda vid Borås Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">The web interface to the HR software system Primula from EVRY HR Solutions AB for employees at Borås Högskola</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDuDCCAqACBQCo2ygOMA0GCSqGSIb3DQEBBAUAMIGfMQswCQYDVQQGEwJTRTEQ
+MA4GA1UECBMHVXBwc2FsYTEdMBsGA1UEChMURXZyeSBIUiBTb2x1dGlvbnMgQUIx
+EDAOBgNVBAcTB1VwcHNhbGExEzARBgNVBAMTCmhyLmV2cnkuc2UxEDAOBgNVBAsT
+B1ByaW11bGExJjAkBgkqhkiG9w0BCQEWF3ByaW11bGFzdXBwb3J0QGV2cnkuY29t
+MB4XDTE1MDEyNzEzMTQ0M1oXDTI1MDEyNDEzMTQ0M1owgZ8xCzAJBgNVBAYTAlNF
+MRAwDgYDVQQIEwdVcHBzYWxhMR0wGwYDVQQKExRFdnJ5IEhSIFNvbHV0aW9ucyBB
+QjEQMA4GA1UEBxMHVXBwc2FsYTETMBEGA1UEAxMKaHIuZXZyeS5zZTEQMA4GA1UE
+CxMHUHJpbXVsYTEmMCQGCSqGSIb3DQEJARYXcHJpbXVsYXN1cHBvcnRAZXZyeS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJstEPNIMU6Q+1Fie
+ekZiInII7woqYNQ9cg30gvwYluNA9aKs9Rx1OXufcvxZEhcQ1R5zCe2gWa7I9bCi
+gyluonu51qmk++c7aMLIXU1pXhM/6sIXIHy36WZbabg7HYp4Ju+diUmV+LxWAe3c
+zjvoFWC3pr4mwJBeUkQtKk+UBLd4L6rOAM2htN6lyXduMcSJMSckS4aZqYMj02Dd
+hz3lMiSVErkA351af+oVC+6HghlnfNyiJbjGh+hslPcvnrBaOCX84/QI36X0NZjo
+7/o5vfmbfEM3K4YZklqhjkXOm+0KuRWj3DLyxqDyMURu4WNpMlap+kPhm1J64agx
+uo6rAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAEl9NSzAegcuz+J2ktf63LNRge/e
+GxWW8KIM2t5HyWYudHBTsVqlSNQEe1V/vmW/lwntct7gGHXwnPp8Ulb3JrGjJq6I
+NukeIMKSMJVHsCYTwbAqeCT6POaX6C8Uzs4CFV8VUv3x61Rbr7BKrYgxf2Q+CyG7
+2fWaucSmjZ56flYFTUmJ1sFzYuFKn9Ty5xPMV/eGmlT8kJ8HBH5E3cVQ+vVSoRYf
+fP/0el9T10aI13RD/03wXWCku1Ewx8Qqw+ANcN9HhZwdH23kpP+jYiBfOmhtCDh1
+DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hb.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hb.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hb.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://hb.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://hb.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
new file mode 100644
index 00000000..5781ba11
--- /dev/null
+++ b/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-hb.hr.evry.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#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/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Primula test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Primula test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Webgränssnittet till HR-systemet Primula (Test-miljö) från EVRY HR Solutions AB för anställda vid Borås Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">The web interface to the HR software system Primula (test) from EVRY HR Solutions AB for employees at Borås Högskola</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIJALQZLo4SG3IqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Rlc3Qtc3NjLmhyLmV2cnkuc2UwHhcNMTQxMTI1MTQ0ODU1WhcNMjQxMTIy
+MTQ0ODU1WjAeMRwwGgYDVQQDExN0ZXN0LXNzYy5oci5ldnJ5LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmMXETFuyDLH3w07c8NvkgzVuwzIXrCE
+Uvs7wZyT6ZxJBZUpv40E3hMjWD6H1HES5EReGn1Pz/N0WNwJgKwPSoXAKdIsarle
+JXT8tLnWh1VwxYwqJAWicIBEHg+wieZOtpx4bZWbuoawrmG4y+Sv2bQ4ysCGTv+e
+ldtBQDDg7AoYgKKNd7XTCvmpCFSRgsvKNlfcM7IqqbQGZXAjAdN8fE925NCwJAXD
+Ls1TkHuhdUDqonkpjeIcOknfl1MYHmabjICyStZapz+3/dwbkUxpR92FwaCg+RcQ
+S0rnS/PL9NXZYliFZp0Xh4ScDIma9psz2sE7slSRYuw1YVUiOu5iawIDAQABo2kw
+ZzBGBgNVHREEPzA9ghN0ZXN0LXNzYy5oci5ldnJ5LnNlhiZodHRwczovL3Rlc3Qt
+c3NjLmhyLmV2cnkuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyz73UbcUW2un96s
+oed1EtDPMQAwDQYJKoZIhvcNAQEFBQADggEBADlt8uXtd2pneWkOTEsnz1pjb9bi
+pirtJavI5AUPV2rK70VRG/jpSbagsZFJWQrw+fPZVEF5emKUyR49EUJRn0KCBNya
+SZg2n3AISr0f3QfubUAzCCHukIRnhGt4xeAAWN05X7ANzxwnGlvVFrY4LQmwYiyD
+8IUFY03HFM86DjGWnC7TfPA4sg12abLkRuWHRytlWSO61a6xXvFflQlAuwMlL6Vm
+gEhPDsDiKCgP+rtRfKirnUj/35G+bl+esZ9Nv4FQ3uEMxezo5IofzVjy92Xg4bxP
+tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-hb.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-hb.hr.evry.se/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-hb.hr.evry.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:artifact-01" Location="https://test-hb.hr.evry.se/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:browser-post" Location="https://test-hb.hr.evry.se/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Primula Web</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" 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"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Primula</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 3dfcb854..14fa54e6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -720,4 +720,6 @@
   <xi:include href="swamid-2.0/lis.ladok.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-stage.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/1827881.mediaspace.kaltura.com.xml"/>
+  <xi:include href="swamid-2.0/test-hb.hr.evry.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hb.hr.evry.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>