Resolved SWAMID-358

14 files changed, 51 insertions, 244 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index f1d8e968..f8b80413 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -13,7 +13,6 @@ aktivera.ki.se-shibboleth.xml
 aktivera.su.se-shibboleth.sso.xml
 aktivering.db.umu.se-shibboleth.xml
 bedomningshandboken.uhr.se-shibboleth.xml
-beta.kib.ki.se-shibboleth.xml
 beta.lobber.se-shibboleth.xml
 betafoo.nordu.net-shibboleth.xml
 bhb-00.its.umu.se-gui-sp.xml
@@ -77,7 +76,6 @@ its-pd0030.ad.umu.se-shibboleth.xml
 its-pd0062.ad.umu.se-shibboleth-sp.xml
 jira-test.it.su.se-shibboleth.sso.xml
 jira.it.su.se-shibboleth.sso.xml
-kib.ki.se-shibboleth.xml
 kiidp.ki.se-idp-shibboleth.xml
 kilw.ki.se-shibboleth.xml
 kilwdev.it.ki.se-shibboleth.xml
diff --git a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
index ffd8f8cd..9b97c01a 100644
--- a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
@@ -21,6 +21,7 @@
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml b/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml
index fc7f1217..72e31df8 100644
--- a/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta-bibliometrics.kib.ki.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
     <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"/>
diff --git a/swamid-2.0/beta.kib.ki.se-shibboleth.xml b/swamid-2.0/beta.kib.ki.se-shibboleth.xml
deleted file mode 100644
index 7eae8315..00000000
--- a/swamid-2.0/beta.kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.kib.ki.se/shibboleth">
-  <md:Extensions>
-    <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/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" 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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>samadhi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
-DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
-ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
-wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
-ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
-rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
-2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
-A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
-DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
-sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
-JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
-pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
-aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
-15HeV+PRFYV9dngg8gm2vg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>samadhi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
-DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
-ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
-wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
-ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
-rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
-2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
-A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
-DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
-sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
-JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
-pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
-aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
-15HeV+PRFYV9dngg8gm2vg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
index 198ac5d4..36337f6a 100644
--- a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
+++ b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <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://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/kib.ki.se-shibboleth.xml b/swamid-2.0/kib.ki.se-shibboleth.xml
deleted file mode 100644
index baa4cbc8..00000000
--- a/swamid-2.0/kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kib.ki.se/shibboleth">
-  <md:SPSSODescriptor AuthnRequestsSigned="1" 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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kib.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=kib.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIErTCCA5WgAwIBAgIJAIP5IJyNmoXHMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-VQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEeMBwGA1UEChMVS2Fyb2xpbnNr
-YSBJbnN0aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxEjAQBgNV
-BAMTCWtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIua2kuc2Uw
-HhcNMTAwNDA4MTQ0NTQyWhcNMjAwNDA1MTQ0NTQyWjCBlTELMAkGA1UEBhMCU0Ux
-EzARBgNVBAgTClNvbWUtU3RhdGUxHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0
-dXRldDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRIwEAYDVQQDEwlraWIu
-a2kuc2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtgHthwONaQo7EerGZrGRIxlzO3thkapS
-+Xox9pt6u5M+8zAuaWnbNHNk2XFqEEntdBYG5lRmo8/EQub+OVdYwHH4uS9mLvMw
-mdBz0oKBuwPetI1PNdqJTOIMKjpsZfl/njK8A0oGZsLiDmhG1ljvFHvPK2vEo80Y
-i4piBqz7eY8ZNxtRjaROffKlnBWY971x19vFmB44xjjsDM1hiqYqOBg2IJLB4l3P
-IKJnwE9yViJKpJ0s2jIszmZ5KrgKEIplPlhPKTerl0PKUVzbYPqlTvd2d9vOaBkb
-ObcgJJiF5RR0quc/PbvFDtY2UlU9RBTVGEOlTyyTzyjVLpKHkhQNQwIDAQABo4H9
-MIH6MB0GA1UdDgQWBBRMUMeg+dfam+KBl786R+VVPe4kvzCBygYDVR0jBIHCMIG/
-gBRMUMeg+dfam+KBl786R+VVPe4kv6GBm6SBmDCBlTELMAkGA1UEBhMCU0UxEzAR
-BgNVBAgTClNvbWUtU3RhdGUxHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRl
-dDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRIwEAYDVQQDEwlraWIua2ku
-c2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlggkAg/kgnI2ahccw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARHxhA4kny2w4qiKh+wMt
-TwZXFCIk+RQeRtlw9ezzOf+W76A1uPTtjy3ARSN7tAKE6BDxnTetSdu7GfzhH/6B
-+xJBxzBfUGFUlgkKLQoA2dOhyUUgxeay++ZL0Od0kJp+aucqhoBQVyfd0PcF4nzL
-ZTecLXwI2vQ4CFoZ8FvDu3bZ6GxWn8vkkinz3HuryBrDl2QXV7SlYgZY/J1cwOYA
-n9fNo1Prk/zTGOghvZYonL1S2LMpNuvB4ek+eH9J/kd9T0xkeDPmDzzDc4Fmptdd
-0u4/ZRFwT4KBe4fzj5hzGhrcvNz/8PAcnB1l7tck4rsDWDJfXjbQD3ehtMkWJxbA
-qQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kib.ki.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ubitdos@kib.ki.se,CN=kib.ki.se,OU=UNIVERSITY LIBRARY,O=Karolinska Institutet,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIErTCCA5WgAwIBAgIJAIP5IJyNmoXHMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-VQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTEeMBwGA1UEChMVS2Fyb2xpbnNr
-YSBJbnN0aXR1dGV0MRswGQYDVQQLExJVTklWRVJTSVRZIExJQlJBUlkxEjAQBgNV
-BAMTCWtpYi5raS5zZTEgMB4GCSqGSIb3DQEJARYRdWJpdGRvc0BraWIua2kuc2Uw
-HhcNMTAwNDA4MTQ0NTQyWhcNMjAwNDA1MTQ0NTQyWjCBlTELMAkGA1UEBhMCU0Ux
-EzARBgNVBAgTClNvbWUtU3RhdGUxHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0
-dXRldDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRIwEAYDVQQDEwlraWIu
-a2kuc2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtgHthwONaQo7EerGZrGRIxlzO3thkapS
-+Xox9pt6u5M+8zAuaWnbNHNk2XFqEEntdBYG5lRmo8/EQub+OVdYwHH4uS9mLvMw
-mdBz0oKBuwPetI1PNdqJTOIMKjpsZfl/njK8A0oGZsLiDmhG1ljvFHvPK2vEo80Y
-i4piBqz7eY8ZNxtRjaROffKlnBWY971x19vFmB44xjjsDM1hiqYqOBg2IJLB4l3P
-IKJnwE9yViJKpJ0s2jIszmZ5KrgKEIplPlhPKTerl0PKUVzbYPqlTvd2d9vOaBkb
-ObcgJJiF5RR0quc/PbvFDtY2UlU9RBTVGEOlTyyTzyjVLpKHkhQNQwIDAQABo4H9
-MIH6MB0GA1UdDgQWBBRMUMeg+dfam+KBl786R+VVPe4kvzCBygYDVR0jBIHCMIG/
-gBRMUMeg+dfam+KBl786R+VVPe4kv6GBm6SBmDCBlTELMAkGA1UEBhMCU0UxEzAR
-BgNVBAgTClNvbWUtU3RhdGUxHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRl
-dDEbMBkGA1UECxMSVU5JVkVSU0lUWSBMSUJSQVJZMRIwEAYDVQQDEwlraWIua2ku
-c2UxIDAeBgkqhkiG9w0BCQEWEXViaXRkb3NAa2liLmtpLnNlggkAg/kgnI2ahccw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARHxhA4kny2w4qiKh+wMt
-TwZXFCIk+RQeRtlw9ezzOf+W76A1uPTtjy3ARSN7tAKE6BDxnTetSdu7GfzhH/6B
-+xJBxzBfUGFUlgkKLQoA2dOhyUUgxeay++ZL0Od0kJp+aucqhoBQVyfd0PcF4nzL
-ZTecLXwI2vQ4CFoZ8FvDu3bZ6GxWn8vkkinz3HuryBrDl2QXV7SlYgZY/J1cwOYA
-n9fNo1Prk/zTGOghvZYonL1S2LMpNuvB4ek+eH9J/kd9T0xkeDPmDzzDc4Fmptdd
-0u4/ZRFwT4KBe4fzj5hzGhrcvNz/8PAcnB1l7tck4rsDWDJfXjbQD3ehtMkWJxbA
-qQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kib.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kib.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml b/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml
index 25a15b18..24586e22 100644
--- a/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/login.proxy.kib.ki.se-shibboleth.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.proxy.kib.ki.se/shibboleth">
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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 http://schemas.xmlsoap.org/ws/2003/07/secext">
     <md:Extensions>
       <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="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext" index="1"/>
diff --git a/swamid-2.0/openarchive.ki.se-shibboleth.xml b/swamid-2.0/openarchive.ki.se-shibboleth.xml
index ec9b76dc..50e9ae85 100644
--- a/swamid-2.0/openarchive.ki.se-shibboleth.xml
+++ b/swamid-2.0/openarchive.ki.se-shibboleth.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openarchive.ki.se/shibboleth">
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-2.0/publications.ki.se-shibboleth.xml b/swamid-2.0/publications.ki.se-shibboleth.xml
index 8ac9eb7e..2934091d 100644
--- a/swamid-2.0/publications.ki.se-shibboleth.xml
+++ b/swamid-2.0/publications.ki.se-shibboleth.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://publications.ki.se/shibboleth">
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml b/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml
index be12eac0..ad602fb9 100644
--- a/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/samadhi.kib.ki.se-shibboleth.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://samadhi.kib.ki.se/shibboleth">
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 3140c0ef..5249eeaf 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -5,7 +5,6 @@
   <xi:include href="swamid-ki-sll-1.0/necs.sll.se.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idp.sll.se-neas.xml"/>
   <xi:include href="swamid-2.0/bibliometrics.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml"/>
   <xi:include href="swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml"/>
diff --git a/swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml b/swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml
deleted file mode 100644
index cd7c28fb..00000000
--- a/swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.kib.ki.se/shibboleth">
-
-  <md:SPSSODescriptor AuthnRequestsSigned="1" 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:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>samadhi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
-DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
-ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
-wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
-ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
-rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
-2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
-A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
-DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
-sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
-JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
-pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
-aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
-15HeV+PRFYV9dngg8gm2vg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>samadhi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=samadhi</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAM1x+5LlJQVQMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB3NhbWFkaGkwHhcNMDkwODE0MTEzMzM4WhcNMTkwODEyMTEzMzM4WjASMRAw
-DgYDVQQDEwdzYW1hZGhpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wBagrMP26PtYqxBexJdsMdyDYCT74qvR5wLeW1znJTS9I1eK8ghXZ0Wy+uGunUU7
-ePkQPDySt3dNOW6hOx9o8Z+/JqwSARj07glBpkN2psiza+7BQP/+l/4iBixGlDea
-wb59dC25cUA5k+YAV1fx6uwufQ/65iRKYilRVxzzSmorrrUuzbKA/Dh6MNCWDkU2
-ppxJ/FS0IiR88rj2ZHZbz2wb1ATLnkevD4mUuRY39P9yxb63bTeCG7GboHrVBmNt
-rrlskaeeIYNHIkiWqbPrW/IMCgMFim7r7fiYebTvhw037UtTFDnwI8DDmcfpvbff
-2hztelbzoERAkXardDqx5QIDAQABozUwMzASBgNVHREECzAJggdzYW1hZGhpMB0G
-A1UdDgQWBBTIRU/xxcULxzxNef3jHDp1W2Br7jANBgkqhkiG9w0BAQUFAAOCAQEA
-DsNpDbtB/fhZIlNN11erKFH1VKgZIsLBu86uEYwi3sqK9+DNk40sdG1U0INY21g5
-sTG/vlt6qyuLcB9C5BA+8Ms3T01vcWg+//4KM4OZuLM/0ylSDxhVCHwJU5erI9Bt
-JSqVQ12JHctvIqdIQm0JRR6CCXVdm6Wjy5vVQZEoIanxcyjd0AUF458M7arGk1RB
-pvLrKdwx16cOS9mkuq5Jg0Oj2yiUjx1WRzNzqAVQXpBb0ZZz0oKGiOqa0AgyfVKs
-aNy8twh152lw5iqjY7qxb9QDhtJpzlPnQk2CmHJbQUXrCK8cLSWSDsiCcaQVicb+
-15HeV+PRFYV9dngg8gm2vg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-
-</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml b/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml
index 33d80321..6cd8e765 100644
--- a/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml
+++ b/swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml
@@ -1,6 +1,13 @@
 
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubtest.kib.ki.se/shibboleth">
-
+  <md:Extensions>
+    <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/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -86,4 +93,4 @@ c7fJJOmf36l5tyqvSMhnNVbprhB8dsF9RiAgFw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubtest.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 793d826e..e8246df6 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -112,7 +112,6 @@
   <xi:include href="swamid-2.0/bibliometrics.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/uu.test.diva-portal.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www4.genuinetext.com-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/beta.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/su.avedas.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.diva-portal.org-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cambro-tst1.umdc.umu.se-shibboleth.xml"/>
@@ -121,7 +120,6 @@
   <xi:include href="swamid-2.0/sp.tools.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/publications.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/brainstorm.swami.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.lobber.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www07test.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/fordrop.irt.kth.se-shibboleth.xml"/>