Resolved SWAMID-358

2 files changed, 9 insertions, 73 deletions

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>