Resolved SWAMID-2139

3 files changed, 130 insertions, 21 deletions

diff --git a/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
index cc5bea63..c7f3826d 100644
--- a/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml
@@ -30,35 +30,50 @@
       <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://backweb.hubbletest.antagning.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Hubbletest</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hubbletest</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Hubbletest</mdui:Description>
+        <mdui:Description xml:lang="en">Hubbletest</mdui:Description>
+        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>backweb.hubbletest.antagning.se</ds:KeyName>
-        <ds:KeyName>https://backweb.hubbletest.antagning.se/hubble-sp</ds:KeyName>
+        <ds:KeyName>backweb.hubbletest.antagning.se/hubble</ds:KeyName>
+        <ds:KeyName>https://expert.hubbletest.antagning.se/ecs-sp</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=backweb.hubbletest.antagning.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDWDCCAkCgAwIBAgIJAJgLnuTySEPvMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-BAMTH2JhY2t3ZWIuaHViYmxldGVzdC5hbnRhZ25pbmcuc2UwHhcNMTcxMTI5MDY1
-MzUyWhcNMjcxMTI3MDY1MzUyWjAqMSgwJgYDVQQDEx9iYWNrd2ViLmh1YmJsZXRl
-c3QuYW50YWduaW5nLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-zeZIdkK/e/PdFOFM4z/Cc4HayK0rk4nrHYh5hQmY9m7FDjiP6veetATXTdW23UEt
-QuP6w9rPfIuZ4AdEpY0sFrsCK9Ahwf8vxVVe7qZNFjmOs5FovJ1QtP6zZAI9SwE3
-300Fel/frPwizwow5x8TV1zHrT/bWxaCqkZ7XjJclQM6n8q27YJ+iSKFnrcwPhie
-eW+WdS+RLnyYMA1rr+e/z42cAumIisyCZeDYY+Y1+0cFNTG/4KOezwyD92epvl7i
-bkMhcov4TKlXdvY/HmHQBh6oc2Fq1qdRyI/cbmzz55UiZMTKsbStdfhCUz875wAy
-gwT3P22vVjkC2eBOigUOxwIDAQABo4GAMH4wXQYDVR0RBFYwVIIfYmFja3dlYi5o
-dWJibGV0ZXN0LmFudGFnbmluZy5zZYYxaHR0cHM6Ly9iYWNrd2ViLmh1YmJsZXRl
-c3QuYW50YWduaW5nLnNlL2h1YmJsZS1zcDAdBgNVHQ4EFgQUOL1zyxoy4p+kGIm7
-THwqgP8fBZEwDQYJKoZIhvcNAQEFBQADggEBAIFpcds3AoS+82VkRm1+5ywdMpT/
-VgIUuYItohX3a8yuGmhBhcbgMwRKdq3IYjGAUgYmbX1tQEF2jhe1OjePvxhRKZDO
-Q4VWocQFz9W/Gtjmw3MMHNdpP3JEcujVoudWs1RdbOIPfucHte/fbpdHnCw5GX7Z
-Hz47bwtpKmARKF/8Jpzey3rYet79YrRa428LN1y08sbPtQfq4DXv5Smr+0v2dP6g
-grO8fwt/qA62STFcHTGl5dWOjY8Y4gLxn/l57OjN8Q8+Vip1oYAonlhfh1CdM6Nj
-y0ggONJ3LJloulEMXr4uhtgpN+8wF8pxklHlwvdOI3iw+iqScUxq1QvBUIM=
+          <ds:X509SubjectName>CN=backweb.hubbletest.antagning.se/hubble</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDajCCAlKgAwIBAgIJAJZ2yUNsCKwRMA0GCSqGSIb3DQEBBQUAMDExLzAtBgNV
+BAMTJmJhY2t3ZWIuaHViYmxldGVzdC5hbnRhZ25pbmcuc2UvaHViYmxlMB4XDTE5
+MDQwMTA3MDUwNloXDTI5MDMyOTA3MDUwNlowMTEvMC0GA1UEAxMmYmFja3dlYi5o
+dWJibGV0ZXN0LmFudGFnbmluZy5zZS9odWJibGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCx/tlvgvIFpOpWJBbtbhvDx0rigu9JZcyDa5WI5LouXzOp
+3E6qmrMSdSNYhmo1UvflEw4fHsZIwnPMHgLQO8FVFdtDH9autgwRzYnxw64OI68B
+8P6FeP6NzqB01eqCBF3bLbNBc9KbOEgwHQfUxjZEAWGCQoy1+RFUri0Dz7+RDgNA
+ymAHcMfMahSJ4SRu37EMgUwOAhnvUZshlCs1X/y1s4C0oMthPBxIHR2M9vLINjIg
+9D9OiamHIOVIiQ2SS6V3jTovidR0UiieP31hXQOLHmGN4Twn9HiR6PumvWR4t+D6
+fXB6SKa9/z7c25oF6tIEa9LpDlsHvyNyEhYdDLqPAgMBAAGjgYQwgYEwYAYDVR0R
+BFkwV4ImYmFja3dlYi5odWJibGV0ZXN0LmFudGFnbmluZy5zZS9odWJibGWGLWh0
+dHBzOi8vZXhwZXJ0Lmh1YmJsZXRlc3QuYW50YWduaW5nLnNlL2Vjcy1zcDAdBgNV
+HQ4EFgQUgn4PZ1QJjMr3XWb2KGZXftj1HZkwDQYJKoZIhvcNAQEFBQADggEBAF13
+UEfzyotQR75eOEwXmAe7Fc2o02TXqwWgwBTT8lxgigZR9JoHTTit96JEZyi8vE5y
+VLhlCBHNdtHl1ifnLwrO/qvVwrz0HW09M4ToJXTaI1SV2CT/cjn0Zdlu/wXK69Pv
+B7YLEYl9SXQ6Ay3kVLJjwviGhRrc1QfotjuUYFKrXdIFoz3EN16Hqm6+EWOxNHLv
+UJ6veXDv98htCis+sJHzc1kVBkb6cB5M2F9Y+s84qxxTqTg5AhPDk190Pl/a2LCR
+KwwncaN/LWxkSVXAYZVCdMM6g8ndcA8Z3ca9gMeB3U5jxnpwljUITfeZWlZExZWs
+DZx9f8+izJuPu5NpX4c=
 </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://backweb.hubbletest.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://backweb.hubbletest.antagning.se/Shibboleth.sso/SLO/SOAP"/>
diff --git a/swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml b/swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml
new file mode 100644
index 00000000..9f3f2e90
--- /dev/null
+++ b/swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.hubbletest.antagning.se:452/anvandare-sp">
+  <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://expert.hubbletest.antagning.se:452/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://expert.hubbletest.antagning.se:452/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Hubbletest användaradministration</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Hubbletest useradministration</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Hubbletest</mdui:Description>
+        <mdui:Description xml:lang="en">Hubbletest</mdui:Description>
+        <mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>expert.hubbletest.antagning.se:452/bw</ds:KeyName>
+        <ds:KeyName>https://expert.hubbletest.antagning.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=expert.hubbletest.antagning.se:452/bw</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDZzCCAk+gAwIBAgIJAIQ9MwNj9pFLMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
+BAMTJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZTo0NTIvYncwHhcNMTkw
+NDAxMDcwNzAwWhcNMjkwMzI5MDcwNzAwWjAwMS4wLAYDVQQDEyVleHBlcnQuaHVi
+YmxldGVzdC5hbnRhZ25pbmcuc2U6NDUyL2J3MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAyQrKw08CX8jMA2uJyAoZ3A1aGsXaQNYwDsvXZj0HrZyXf7W6
+1QSJBsTlkMkhzHkg697pBjdPvOCZy9SI18CMvp/ycJ8Lw1svy18MepgbE12XNHqI
+SfcB8E9wOctD9XvCZ3MJYUhm3LCffTcRsMAfZG7tUTmvu9BVbpguFO5GZDEmfd0a
+OHXS5XldWtkwHy1WLxOKCUb25xJBkHSMszwFAbzSfWObSPCCOmF0Qbqvig8T8h/T
+blqPBRMPuCVLem9ExFnAafOplbWJ6C9SZKLUnW251HWfrn6uKr5JiSpSYECpTXnt
+CcC6Ca1eoPEiNl1jlHRfdJ4bSDZX2DXYZByTwwIDAQABo4GDMIGAMF8GA1UdEQRY
+MFaCJWV4cGVydC5odWJibGV0ZXN0LmFudGFnbmluZy5zZTo0NTIvYneGLWh0dHBz
+Oi8vZXhwZXJ0Lmh1YmJsZXRlc3QuYW50YWduaW5nLnNlL2Vjcy1zcDAdBgNVHQ4E
+FgQUbZ3pS9QMDcjeqkhfYcaxrY6jPUowDQYJKoZIhvcNAQEFBQADggEBAKM2Oh4/
+d7++8FpvKUiODyjYDSp8xnnTIcPH+fNuiNnLTtUThU995HOfOWOWCW3LdmIN5wLE
+J0/mQADX1bwhlhimBMnlUF/r6nJw37XTxgOmEvorIO/DH5EJ8vSymkesDRC0d8HD
+ZacuUIIWoW9H3fe+NSzkXzMdGatNcfxxArP0Ge+HuTlBd/Nsk9o/zZNuYEAwQKiN
+P7OMnQsFslVgD4M4MXaGFHXIkmfoz+vgBUzN/K1tlw0JHiIQWrxzm+hokT3zTD0y
+/65z9RCIqxW6vvGV6p/fCFZ1fNELsoCJlBpMc2JTfHdYfZfFeE/t0sRGKLxd2Tj0
+tSrfWefE7kzjfEE=
+</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://expert.hubbletest.antagning.se:452/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.hubbletest.antagning.se:452/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index e018e0d0..ab5f4168 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -627,4 +627,5 @@
   <xi:include href="swamid-2.0/lu.beta.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/lu.test.instructure.com-saml2.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml"/>
+  <xi:include href="swamid-2.0/expert.hubbletest.antagning.se-452-anvandare-sp.xml"/>
 </md:EntitiesDescriptor>