Resolves SWAMID-3313

1 files changed, 64 insertions, 25 deletions

diff --git a/swamid-2.0/secure.port.se-shibboleth.xml b/swamid-2.0/secure.port.se-shibboleth.xml
index 442b9b90..8cd86a3e 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/swamid-2.0/secure.port.se-shibboleth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Metadata Nordic Port prod environment
+Metadata KLARA chemical management system 2020-09-03 Ecoonline sweden AB
  -->
 <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://secure.port.se/shibboleth">
   <md:Extensions>
@@ -27,42 +27,81 @@ Metadata Nordic Port prod environment
       <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/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <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 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://secure.port.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://secure.port.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://secure.port.se/Shibboleth.sso/Login-lu"/>
+      <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://secure.port.se/Shibboleth.sso/Login-su"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">KLARA</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">KLARA</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">KLARA är ett webbaserat system med syfte att inventera, sammanställa, visa och följa upp information om kemikalier och kemiska produkter som hanteras av en organisation.  Systemet skall även fungera som ett informationssystem till alla som hanterar kemikalier i organisationen.  Med hjälp av KLARA kan man enkelt få svar på frågor som rör den egna verksamhetens hantering av kemikalier</mdui:Description>
+        <mdui:Description xml:lang="sv">KLARA är ett webbaserat system med syfte att inventera, sammanställa, visa och följa upp information om kemikalier och kemiska produkter som hanteras av en organisation. Systemet skall även fungera som ett informationssystem till alla som hanterar kemikalier i organisationen.  Med hjälp av KLARA kan man enkelt få svar på frågor som rör den egna verksamhetens hantering av kemikalier</mdui:Description>
         <mdui:Description xml:lang="en">KLARA is a web based system with the purpose of making it easier and more time efficient for management and staff to make inventories, compile, view and follow up information about chemicals and chemical products which are used by the organisation in a cost effective way.  KLARA serve as an information system to all who handle chemicals within your organisation.  KLARA allows you to control and monitor all of your organisation's chemical usage in detail.</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
-        <ds:KeyName>web01.prod.port.se</ds:KeyName>
+        <ds:KeyName>klara-web01.ad.klara.port.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=web01.prod.port.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJALAqk2fLCj4uMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEndlYjAxLnByb2QucG9ydC5zZTAeFw0xNTEwMTUyMTI0NDRaFw0yNTEwMTIy
-MTI0NDRaMB0xGzAZBgNVBAMTEndlYjAxLnByb2QucG9ydC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM6gnp/MQ+3theDrGsFoAtiZsNuffStG46OV
-DHXfmWwYfWVR1/J7d8HHbYVcMAyJKs8OBi/J+Ic6b01gPjMUUUY7zJmd9ZEqpuFN
-oJcp6vEMQ+ILBx7iGtx9S3qBiwgYtnEqDMfOOaVxgUBuLRkpSJ682xTejczGZn7O
-qYV+oKdmT3vUlD1GXV8c+ZXOQhTLdxGkQjFkU2+i8+Gmq1EPZtEJppuf8wLTJCTd
-13Ik0LjDx+KBNMgucPnALUwNTodO+3FuIJT8eqoBfi8LKot1luvwq6iIyZgSlt6P
-4HI3UQ6CQE7lMi4WL5okmgx0WlhgEfay/ICR64g8nxjS54PlBUcCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISd2ViMDEucHJvZC5wb3J0LnNlMB0GA1UdDgQWBBRWbQ39HN5r
-oIktPsZhdeaJRWSKtzANBgkqhkiG9w0BAQUFAAOCAQEAJWcwbeCrjqS8BYod93+a
-nl9wyeuBJIJUennhthmZoE1BepTfdM6j+tyDTdkypOMlbjAhQB2hBu6n7cjPMZc2
-tDehCYrxYM7r7V01UUjpvSMlKS5Ujav31zPQRunO33ppMsRkPmkTBWQiDlGTx3Tq
-RSlDn9R9DsRTwzFeJbl7cW6un2hsDZk+w8+AdGLf9lpgFGQucmuuOlNIH7bL71jZ
-oj3UPFr5yrYfG3U9jNfehfdVMI/3biTrUa7Eg8bAEiKWWdofXHnvJ0cDB+Ow0Yek
-VaVIi9tnmwAwQSVBw0L1rPCgy5X91UScJk5EIDL1Z8VO+7gnJmh73cvgL/7tfR8Z
-4A==
+          <ds:X509SubjectName>CN=klara-web01.ad.klara.port.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEJjCCAo6gAwIBAgIUR+ah1fERIMUYuhIc117FODog1z8wDQYJKoZIhvcNAQEL
+BQAwJzElMCMGA1UEAxMca2xhcmEtd2ViMDEuYWQua2xhcmEucG9ydC5zZTAeFw0y
+MDA4MjUwOTM0MDdaFw0zMDA4MjMwOTM0MDdaMCcxJTAjBgNVBAMTHGtsYXJhLXdl
+YjAxLmFkLmtsYXJhLnBvcnQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
+AoIBgQCgV301Zu0X55mX4bRwXOOUkLIJKjP+fk/w+gwJn3Y9B7VokbVv6SuP7cQC
+0mbMp92YGa7klspFAfXZUWI9+O1csHgmu/5AIHBb12t6zDmeH7hk9tVO0MUjCZHZ
+goR+iCT+z1z22nNfxJRtWBracgI2fShUZNTckBRFdoUVJrFA1lqLH3/foU675KF8
+iyJtK1icFjq+p2I9oQKWMUC5W5e/EKV/Mot2bUMPsSiMnAJ7rRxAv2TX6UAOhpry
+EyB57pR3C6AlsothmppDbD/RofSi5EINXgoUExuVMYhPKYVIsYNpKkGd6DTHRb4p
+7n7Ah7WqaoJYnuPr8xonq2XVYp2TqP71Dp+QjUvNvpaSqC2BQiVuNadTTy7/MrkW
+2Ij1GnjiT0s+g8ddYIiTO8zkFdLg1NxZwl7dBdRWiw0U8sWSPRS09MYaoPdzK74h
+H83HxcBaabJw9ZOjoZ8/y5ru5fGHFoIEe4VQh1AjaD9w88hUQLpzkGlq4p1aX1ig
+iHbjK30CAwEAAaNKMEgwJwYDVR0RBCAwHoIca2xhcmEtd2ViMDEuYWQua2xhcmEu
+cG9ydC5zZTAdBgNVHQ4EFgQUWqJrRYObu9m6oloHRDDraxXeT0QwDQYJKoZIhvcN
+AQELBQADggGBAFziEM3V7y8kvq8D3Xe6ud/hOKJHnbE6o7nJMfJOsEPM8BFbivPW
+BV1qbiE2IbpEDJU9mBUV8ZyRrP+XnjXAv/rR4VBqKURnAJzk8tRMecoWafk9yY5H
+f+Id9ICRdTZF0yDVEPFekaJo5NxzotlUt4tvMF5tJoNRYc3wf13OrEZHYlsA/GlY
+Ws8RzhftEx+o2srnKxojUPmbxXBHURPAlLHU16OPNSQo+GOKEwYadtZO2/gLD8yB
+MbGBrwgTpnpjtYtq1PwCKaKubOWVYHvEv5N1L81LLBdHXi98Oyf2fWLI+f7/24Sx
+zYm65XPChl//KK9y4ds1BZJ7dHGdPQetYbHsJ1eBI1ZEGCtMXMTUjT5eP75JCIG+
+6Z+hkmmT74/T+wEavTS7mx0UJcDmkSeXHzydcCDN/yYhQ/2yo/U6TZKE+jG7aCkX
+HbXHH4lxoBVjEQyDCBQiJMbWXDsBUl3j9Am+WNQpDektF4oT4j2Q1xMgz6vZ3jun
+K7owlPvwR8ekvg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:KeyName>klara-web01.ad.klara.port.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=klara-web01.ad.klara.port.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEJjCCAo6gAwIBAgIUKJN8YeQ+YCIx5IbB8bjLvooFp9kwDQYJKoZIhvcNAQEL
+BQAwJzElMCMGA1UEAxMca2xhcmEtd2ViMDEuYWQua2xhcmEucG9ydC5zZTAeFw0y
+MDA4MjUwOTM0MDZaFw0zMDA4MjMwOTM0MDZaMCcxJTAjBgNVBAMTHGtsYXJhLXdl
+YjAxLmFkLmtsYXJhLnBvcnQuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGK
+AoIBgQDSvUE0KR6/aKnV2wtMjldk9Hy6paNWbbpDR+0fhOc3ZJgcQ7rUVfqrR1JQ
+pW9TSQBlkv/LmBTZ8+AeIpSwtnPzZMJIJytT+AjizegpF+3tW8GX1DsLTDLJAEg9
+6LKy6kbWWDwanpTImALkEHWiBtxLkexAhZ7VAwTlUjGwMePWX5YxjJJjHMBnVd/Z
+6q2t0u0vc9u6nwU5FJXNCAbNjTLj1SnXKzrqi6FUcRVfXCzBLeXNmC6tTrlTrtwX
+1qwiceAl9HSZG8SmuBQzCwEAPODSIRw+6hS6EqCxrF6yB+mcCYTIbYES6e9PUN9g
+mDiTCB4YqUrP0dqbcB2gkuIAFH9rXrNOci32efrTVEmV4jusufqRlQZIwwZqS0PM
+Q0rm+LtD2GE8Ux0mAn367t6sluG+1dX9vTQDNr1Tp7FN6RT1CqS98bap+CuEAn2P
+es585yP2/EcbBy5mrCAnmOSrEdHDZix6Wor4gJ0CIaf34XlcGTpNxUFYormNU2rW
+gW4F9ysCAwEAAaNKMEgwJwYDVR0RBCAwHoIca2xhcmEtd2ViMDEuYWQua2xhcmEu
+cG9ydC5zZTAdBgNVHQ4EFgQU5IsnfpmwEOnfI4mniFt6XW38xmUwDQYJKoZIhvcN
+AQELBQADggGBAHGzYGi+AIUl5pi1T8BbbNAeFKobWKSI2r/sw7GqLj1oqc4g59jY
+rmvmM9maaCJyKEsN+J1qEFm3cyiZH9mLAgoAQnNDp/3XBsK7N2noYPBoeOtYzGyQ
+sGXWRajb9eqUO8G5hELOqnvbcuXdAEnD+zY36V33aRhevxdAC6NNI3QVuniNs6bn
+AFQc56sjxG0WGYhc7D29EF2QrWZ2ms01muW/JFmMy8/46WEQO0SjdfHfd3fcZeHS
+NJHrIBY4O5ZIGjQ1TwNZ9eKzWj6fgj1EIzalExJIOSJqnqGtdJ8vluOWwo+KbMyq
+kP9jgdUwH8BRc9JJpJwBwfY9XUVg6w+7RLY+p4QsANGWIF7a9i0iqQkKjwdiUzwa
+lFCmbNv+usdh9TH46N/7Ja7uiFJT0pSkpyEdiIb8pdLjPYtDB2IGtz7MLCYH/Cv0
+jg+K0Ja8Rx+pKcY71szjmUSOyY7rZNPya8TMV+SSHjbFjr1lth5Q8MhWjLINjm7r
+tbiEvSMrr8hroQ==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -90,6 +129,6 @@ VaVIi9tnmwAwQSVBw0L1rPCgy5X91UScJk5EIDL1Z8VO+7gnJmh73cvgL/7tfR8Z
   <md:ContactPerson contactType="technical">
     <md:GivenName>Lennart</md:GivenName>
     <md:SurName>Risfelt</md:SurName>
-    <md:EmailAddress>mailto:lennart@port.se</md:EmailAddress>
+    <md:EmailAddress>mailto:lennart.risfelt@ecoonline.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>