SWAMID-2431 Updated shibboleth.uhr.se

1 files changed, 66 insertions, 28 deletions

diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index a480201e..d4b258fb 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -12,6 +12,7 @@
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <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/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,12 +39,10 @@
         <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+          <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
 MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
@@ -59,17 +58,35 @@ Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
 VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
 rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
 jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
-UIW4Y6GzlL7EfXr31lnv
-
-                    </ds:X509Certificate>
+UIW4Y6GzlL7EfXr31lnv</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
+MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
+u171uRRfilAcCPQR6/t4O+dpLCTg17y7kACVc113sUr90G5qzYPRv9xW//FeG+Se
+uATy5+As8uh8E0J4WnScx9G0GwYsmbkXncit7EATOBJi468bD6+K2N10PWHouqIF
+fPIv+MVPRSYQnqCk5+PvEzq56izBxpWfAHcO3TmCQ3Y+UEtYcEB+dcFdPpMAfFlv
+YJySvsCwy4VBWY6atqFhsMUWIKQp042/DB18eUmvzYA4n+tR8E9WQTKza/AtOZZF
+VL1qOJRqrV/bc6z81KpAX9PuZr8bC7POAtI2QYYy6dEdP149AgMBAAGjUDBOMB0G
+A1UdDgQWBBSb+Wr9vnHPBITF2fo5iQr+eximeTAfBgNVHSMEGDAWgBSb+Wr9vnHP
+BITF2fo5iQr+eximeTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAb
+PjD0cLzg6cM8Ftuyhs/fRttJuK2O8yTUBbZh0khY8XFwNaT1f7noOx7nw9XL/ZdU
+Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
+VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
+rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
+jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
+UIW4Y6GzlL7EfXr31lnv</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhr.se/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uhr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -79,12 +96,10 @@ UIW4Y6GzlL7EfXr31lnv
     <md:Extensions>
       <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+          <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
 BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
 MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
 DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
@@ -100,25 +115,43 @@ Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
 VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
 rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
 jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
-UIW4Y6GzlL7EfXr31lnv
-
-                    </ds:X509Certificate>
+UIW4Y6GzlL7EfXr31lnv</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCzCCAfOgAwIBAgIJAPm+X8wR07n6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMMEXNoaWJib2xldGgudWhyLnNlMB4XDTE0MTIxODEzMDAxOVoXDTI0MTIxNTEz
+MDAxOVowHDEaMBgGA1UEAwwRc2hpYmJvbGV0aC51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC0ZeAWa/eGw+QxcBP6yjkGd1B+8aC+z29O3IJ5
+u171uRRfilAcCPQR6/t4O+dpLCTg17y7kACVc113sUr90G5qzYPRv9xW//FeG+Se
+uATy5+As8uh8E0J4WnScx9G0GwYsmbkXncit7EATOBJi468bD6+K2N10PWHouqIF
+fPIv+MVPRSYQnqCk5+PvEzq56izBxpWfAHcO3TmCQ3Y+UEtYcEB+dcFdPpMAfFlv
+YJySvsCwy4VBWY6atqFhsMUWIKQp042/DB18eUmvzYA4n+tR8E9WQTKza/AtOZZF
+VL1qOJRqrV/bc6z81KpAX9PuZr8bC7POAtI2QYYy6dEdP149AgMBAAGjUDBOMB0G
+A1UdDgQWBBSb+Wr9vnHPBITF2fo5iQr+eximeTAfBgNVHSMEGDAWgBSb+Wr9vnHP
+BITF2fo5iQr+eximeTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAb
+PjD0cLzg6cM8Ftuyhs/fRttJuK2O8yTUBbZh0khY8XFwNaT1f7noOx7nw9XL/ZdU
+Fbedb+z/ncMmYhiB18wBxnNnAy0BK0Udef/gCtqPKlRxkxCuOMeQe92zrsYoqQgA
+VoZ0+1oHRCzBg6hzeGypg2AcnV46y58F6RNdLJAINLCJ7Flzh35b9M9Xzuxv6t9c
+rxFkRKuKa3AqBppaQFub7FoEeZlMruDJpp2LuC+8ML2BqQLf6ZqfgrX3dHBbLpa6
+jEOshjUyWKPPqAY3pnb71DVlMcLEcEK97YYQtYK/ZvnyFVRPpQ5FWBx9PsuLvKjY
+UIW4Y6GzlL7EfXr31lnv</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uhr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>The Swedish Council for Higher Education</md:Company>
@@ -128,14 +161,19 @@ UIW4Y6GzlL7EfXr31lnv
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Johan Andersson</md:SurName>
-    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
+    <md:SurName>Technical Team</md:SurName>
+    <md:EmailAddress>mailto:alertoperators@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Johan Andersson</md:SurName>
-    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
+    <md:SurName>Support Team</md:SurName>
+    <md:EmailAddress>mailto:alertoperators@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@uhr.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>