entity categories added for NyA SP:s

cleanup of obsolete idps/sps
SWAMIDOPS-6988

10 files changed, 60 insertions, 9 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index bc97966b..29aa454e 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -4,8 +4,6 @@
   <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
   <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
diff --git a/nya-1.0.mxml b/nya-1.0.mxml
index 257e6454..46af250b 100644
--- a/nya-1.0.mxml
+++ b/nya-1.0.mxml
@@ -4,8 +4,6 @@
   <xi:include href="swamid-1.0/shib-sp.kau.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/public.it.secure.su.se-shibboleth.xml"/>
   <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
-  <xi:include href="nya-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/shib1.oru.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/sp-nya.bth.se-shibboleth.xml"/>
   <xi:include href="swamid-1.0/akino.hh.se-shibboleth.xml"/>
diff --git a/nya-1.0/www.antagning.se-ecs-sp.xml b/nya-1.0/www.antagning.se-ecs-sp.xml
index 85016412..79886fde 100644
--- a/nya-1.0/www.antagning.se-ecs-sp.xml
+++ b/nya-1.0/www.antagning.se-ecs-sp.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://www.antagning.se/ecs-sp">
+  <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/eu-adequate-protection</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-1.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
index 91ea5e10..d5cfe3a0 100644
--- a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testa.antagning.se-ecs-sp.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://expert.testa.antagning.se/ecs-sp">
+  <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/eu-adequate-protection</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>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testa.antagning.se/Shibboleth.sso/Login"/>
diff --git a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
index cab49390..e085bce8 100644
--- a/swamid-1.0/expert.testb.antagning.se-ecs-sp.xml
+++ b/swamid-1.0/expert.testb.antagning.se-ecs-sp.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://expert.testb.antagning.se/ecs-sp">
+  <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/eu-adequate-protection</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>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://expert.testb.antagning.se/Shibboleth.sso/Login"/>
diff --git a/swamid-1.0/www.testa.antagning.se-aws-sp.xml b/swamid-1.0/www.testa.antagning.se-aws-sp.xml
index 79e949cf..a3dbd377 100644
--- a/swamid-1.0/www.testa.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.testa.antagning.se-aws-sp.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://www.testa.antagning.se/aws-sp">
+  <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:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.antagning.se/Shibboleth.sso/Login"/>
diff --git a/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml
index c0418536..23ada522 100644
--- a/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-1.0/www.testa.universityadmissions.se-aws-sp-en.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://www.testa.universityadmissions.se/aws-sp-en">
+  <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:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testa.universityadmissions.se/Shibboleth.sso/Login"/>
diff --git a/swamid-1.0/www.testb.antagning.se-aws-sp.xml b/swamid-1.0/www.testb.antagning.se-aws-sp.xml
index af20e31c..b1040fe2 100644
--- a/swamid-1.0/www.testb.antagning.se-aws-sp.xml
+++ b/swamid-1.0/www.testb.antagning.se-aws-sp.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://www.testb.antagning.se/aws-sp">
+  <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-1.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
index a6856240..4054c580 100644
--- a/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-1.0/www.testb.universityadmissions.se-aws-sp-en.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://www.testb.universityadmissions.se/aws-sp-en">
+  <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:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.testb.universityadmissions.se/Shibboleth.sso/Login"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 0ed3970d..a99131e8 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -44,11 +44,6 @@
   <xi:include href="swamid-1.0/nya-15.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/wb11.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/wb11.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.testa.antagning.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.testc.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.antagning.testd.ladok.umu.se-ecs-sp.xml"/>
-  <xi:include href="swamid-1.0/www.studera.testc.ladok.umu.se-aws-sp.xml"/>
-  <xi:include href="swamid-1.0/www.studera.testd.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/hubbletest.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-16.ladok.umu.se-aws-sp.xml"/>