tagged connect servers with r&e category

4 files changed, 45 insertions, 8 deletions

diff --git a/swamid-1.0/connect-beta.sunet.se.xml b/swamid-1.0/connect-beta.sunet.se.xml
index 46b0b2c7..ccd375ac 100644
--- a/swamid-1.0/connect-beta.sunet.se.xml
+++ b/swamid-1.0/connect-beta.sunet.se.xml
@@ -1,5 +1,15 @@
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.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/research-and-education</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
diff --git a/swamid-1.0/connect-stable.sunet.se.xml b/swamid-1.0/connect-stable.sunet.se.xml
index ae362cda..e46aa3b5 100644
--- a/swamid-1.0/connect-stable.sunet.se.xml
+++ b/swamid-1.0/connect-stable.sunet.se.xml
@@ -1,6 +1,15 @@
-
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b1dea4b383f174f509b2659a25c968af" entityID="https://connect-stable.sunet.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/research-and-education</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-stable.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
diff --git a/swamid-1.0/connect-test.sunet.se.xml b/swamid-1.0/connect-test.sunet.se.xml
index ca39efd8..c1f8fe5b 100644
--- a/swamid-1.0/connect-test.sunet.se.xml
+++ b/swamid-1.0/connect-test.sunet.se.xml
@@ -1,6 +1,15 @@
-
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-test.sunet.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/research-and-education</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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#">
@@ -72,4 +81,4 @@ iMkYL+yQK1JqNXDJwr+eW3+iWptUXnyRCnGBrYMAvqw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/connect.sunet.se.xml b/swamid-1.0/connect.sunet.se.xml
index c7b1bf97..24ff1fe7 100644
--- a/swamid-1.0/connect.sunet.se.xml
+++ b/swamid-1.0/connect.sunet.se.xml
@@ -1,6 +1,15 @@
-
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.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/research-and-education</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+          <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>