From f4cfa602faa8f1a49fdf3a822eab676799d02bf9 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Thu, 10 Oct 2024 13:16:51 +0200
Subject: SWAMID-4756 & SWAMID-4757 Updated idp.hkr.se and
 https://hkrplay.hkr.se

---
 metadata/swamid-2.0/hkrplay.hkr.se.xml             |  4 ++
 .../swamid-edugain/idp.hkr.se-idp-shibboleth.xml   | 46 +++-------------------
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/metadata/swamid-2.0/hkrplay.hkr.se.xml b/metadata/swamid-2.0/hkrplay.hkr.se.xml
index 322b4129..d591bf21 100644
--- a/metadata/swamid-2.0/hkrplay.hkr.se.xml
+++ b/metadata/swamid-2.0/hkrplay.hkr.se.xml
@@ -66,4 +66,8 @@
     <md:SurName>Service desk 3030</md:SurName>
     <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Helpdesk Response Team</md:GivenName>
+    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
index 5a56d79c..a184601c 100644
--- a/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
+++ b/metadata/swamid-edugain/idp.hkr.se-idp-shibboleth.xml
@@ -9,6 +9,7 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/sirtfi2</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:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
@@ -21,7 +22,7 @@
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hkr.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hkr.se/idp/shibboleth">
     <md:Extensions>
       <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -39,9 +40,8 @@
       <mdui:DiscoHints>
         <mdui:DomainHint>hkr.se</mdui:DomainHint>
         <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
         <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
+        <mdui:IPHint>194.47.32.0/20</mdui:IPHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -67,47 +67,13 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
-MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
-fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
-xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
-CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
-6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
-bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
-BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
-Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
-exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
-HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
-qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
-kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.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:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Kristianstad University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Högskolan Kristianstad</md:OrganizationName>
@@ -120,19 +86,19 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k</ds:X509Certificate>
     <md:Company>Högskolan Kristianstad</md:Company>
     <md:SurName>Service desk 3030</md:SurName>
     <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+    <md:TelephoneNumber>46 44 250 3030</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Högskolan Kristianstad</md:Company>
     <md:SurName>Service desk 3030</md:SurName>
     <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+    <md:TelephoneNumber>46 44 250 3030</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Högskolan Kristianstad</md:Company>
     <md:SurName>Service desk 3030</md:SurName>
     <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
+    <md:TelephoneNumber>46 44 250 3030</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Helpdesk Response Team</md:GivenName>
-- 
cgit v1.2.3