SWAMID-1851: Updated idpshibboleth.irf.se

1 files changed, 35 insertions, 43 deletions

diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index e0629cda..eec9e6d9 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -10,9 +10,12 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
       </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -22,23 +25,23 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.irf.se/sv/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://cloud.irf.se/s/mkagGeXZPb7aSyg</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+        <mdui:Description xml:lang="sv">Identitesutfärdare för Institutet för rymdfysik</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Swedish Institute of Space Physics</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.irf.se/sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.irf.se/en/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://cloud.irf.se/s/mkagGeXZPb7aSyg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://cloud.irf.se/s/mkagGeXZPb7aSyg</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="80" width="80">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="80" width="80">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus space physics campus</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>irf.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
         <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
         <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
         <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
         <mdui:IPHint>193.11.16.0/24</mdui:IPHint>
         <mdui:IPHint>193.11.17.0/24</mdui:IPHint>
         <mdui:IPHint>2001:6b0:27::/48</mdui:IPHint>
@@ -47,8 +50,7 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
 BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMTYwMjA4MTIy
 MDMzWhcNMzYwMjA4MTIyMDMzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
 Zi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRf6rttUT2iQB/z
@@ -65,16 +67,14 @@ ZCuTZpgSP69Qgz3JHPPcqi7+PF893zb5omDPf0AdWC+CrLGdYEOpOrODQ7gC2t/3
 iDPll7XTALQNSwen7/Q1TxQQS/PFUGbgxSt+Hk9woU5QMlbvsiqM813JsVS7vxgA
 AJ1MDeT4luzSG1Vc/bfH8RkaDI+lhR0FZe0xmhYaS2nG7kyEn0lBYjbevE1ZpaRe
 wrDZBcvSQ6jJw91F/CHHutF2nzaZuALlK9/3azDGx5LbUFCIxvmeM4Gmz8csx8rz
-4okhyqwoeyl2XUl1z+PB
-                        </ds:X509Certificate>
+4okhyqwoeyl2XUl1z+PB</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
 cmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa/mHPOa5/M9Ur
@@ -91,16 +91,14 @@ i4hnWitIE79kJ9FXEvgSnJORuIvaKzlheno7fa5x3mU3TnnHrPdc5nLSXNhFnezk
 4kqvIK5GL0bJQGuf6BKU/Ot8GFYPTKAi1D2aRaI3xzc7cj/EpCpFiEKWUbBFOHN8
 FYtcAWcGkYZsHioAMaaKNuVnk2srKT4lNrIVMFn+8mzri18rIs7GPrUi2tK2LoX0
 CkZfFUJynwfG4GDixCdVykAiT+DJAZ0AUOGAD0ASgp0fcYp4q54WqFngl3IvCr2T
-0Kcn98Fuw5/qCHZ1mIAgyA==
-                        </ds:X509Certificate>
+0Kcn98Fuw5/qCHZ1mIAgyA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
 cmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc87Ku2vkiAXTa
@@ -117,8 +115,7 @@ XGKoaSjrvMQRLyQ0yzGUkJkrEA026bAS+XtKXt3N1QnSnCDg8iyRG3eMJMQxlADw
 tM7KXBNdmmyZoFQsvgazQKCfcqpSieznAfpHS6QkOjSJS7qjmZvE9gR9+LrQjtGb
 SUpvSthL7xqz9bSHJsH3LBh/0fnQ1+eEY5XkMAKzdjaesWYSfJOUWcUojcyYY7TO
 vsUgGd85RO4yz1NF7JL/8KMHODq6/vHeE53VgHXRdeH0ntl04Gvzu6oyl7En3G5B
-CQNfH97cIrTE5N/RQ7XWcw==
-                        </ds:X509Certificate>
+CQNfH97cIrTE5N/RQ7XWcw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -128,6 +125,7 @@ CQNfH97cIrTE5N/RQ7XWcw==
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshibboleth.irf.se/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshibboleth.irf.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
@@ -137,8 +135,7 @@ CQNfH97cIrTE5N/RQ7XWcw==
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUA93wi+Avn0weW0JMfqJ3DxZWLjgwDQYJKoZIhvcNAQEL
 BQAwHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5pcmYuc2UwHhcNMTYwMjA4MTIy
 MDMzWhcNMzYwMjA4MTIyMDMzWjAfMR0wGwYDVQQDDBRpZHBzaGliYm9sZXRoLmly
 Zi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRf6rttUT2iQB/z
@@ -155,16 +152,14 @@ ZCuTZpgSP69Qgz3JHPPcqi7+PF893zb5omDPf0AdWC+CrLGdYEOpOrODQ7gC2t/3
 iDPll7XTALQNSwen7/Q1TxQQS/PFUGbgxSt+Hk9woU5QMlbvsiqM813JsVS7vxgA
 AJ1MDeT4luzSG1Vc/bfH8RkaDI+lhR0FZe0xmhYaS2nG7kyEn0lBYjbevE1ZpaRe
 wrDZBcvSQ6jJw91F/CHHutF2nzaZuALlK9/3azDGx5LbUFCIxvmeM4Gmz8csx8rz
-4okhyqwoeyl2XUl1z+PB
-                        </ds:X509Certificate>
+4okhyqwoeyl2XUl1z+PB</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAKNIMRVddJl8Eq2nzLvhFamfj39qMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
 cmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa/mHPOa5/M9Ur
@@ -181,16 +176,14 @@ i4hnWitIE79kJ9FXEvgSnJORuIvaKzlheno7fa5x3mU3TnnHrPdc5nLSXNhFnezk
 4kqvIK5GL0bJQGuf6BKU/Ot8GFYPTKAi1D2aRaI3xzc7cj/EpCpFiEKWUbBFOHN8
 FYtcAWcGkYZsHioAMaaKNuVnk2srKT4lNrIVMFn+8mzri18rIs7GPrUi2tK2LoX0
 CkZfFUJynwfG4GDixCdVykAiT+DJAZ0AUOGAD0ASgp0fcYp4q54WqFngl3IvCr2T
-0Kcn98Fuw5/qCHZ1mIAgyA==
-                        </ds:X509Certificate>
+0Kcn98Fuw5/qCHZ1mIAgyA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>MIIDPDCCAiSgAwIBAgIVAN/1x1Wau72Xw/BL88E9dnVPnD1MMA0GCSqGSIb3DQEB
 CwUAMB8xHTAbBgNVBAMMFGlkcHNoaWJib2xldGguaXJmLnNlMB4XDTE2MDIwODEy
 MjAzMloXDTM2MDIwODEyMjAzMlowHzEdMBsGA1UEAwwUaWRwc2hpYmJvbGV0aC5p
 cmYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc87Ku2vkiAXTa
@@ -207,8 +200,7 @@ XGKoaSjrvMQRLyQ0yzGUkJkrEA026bAS+XtKXt3N1QnSnCDg8iyRG3eMJMQxlADw
 tM7KXBNdmmyZoFQsvgazQKCfcqpSieznAfpHS6QkOjSJS7qjmZvE9gR9+LrQjtGb
 SUpvSthL7xqz9bSHJsH3LBh/0fnQ1+eEY5XkMAKzdjaesWYSfJOUWcUojcyYY7TO
 vsUgGd85RO4yz1NF7JL/8KMHODq6/vHeE53VgHXRdeH0ntl04Gvzu6oyl7En3G5B
-CQNfH97cIrTE5N/RQ7XWcw==
-                        </ds:X509Certificate>
+CQNfH97cIrTE5N/RQ7XWcw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -217,29 +209,29 @@ CQNfH97cIrTE5N/RQ7XWcw==
   <md:Organization>
     <md:OrganizationName xml:lang="en">IRF</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">IRF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.irf.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.irf.se/sv/</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Swedish Institute of Space Physics</md:Company>
     <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
+    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
     <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Swedish Institute of Space Physics</md:Company>
     <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
+    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
     <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Swedish Institute of Space Physics</md:Company>
+    <md:SurName>Mats Luspa</md:SurName>
+    <md:EmailAddress>mailto:swamid@irf.se</md:EmailAddress>
+    <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
+  </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Security Response Team</md:GivenName>
     <md:EmailAddress>mailto:abuse@irf.se</md:EmailAddress>