summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Åslund <fredrik.aslund@umu.se>2013-09-09 16:15:06 +0200
committerFredrik Åslund <fredrik.aslund@umu.se>2013-09-09 16:15:06 +0200
commit714ab874bd264f6c6e0120e59d702c84182ffa65 (patch)
treea466050237f25b5395ef419358596cee4c60b295
parent3d3aa0dc9ed696c806b4fa0ff243c5827346d8cc (diff)
admin-tug-1.eduid.se moved from swamid-2.0 to swamid-testing-1.0
tagged with NREN-RE
-rw-r--r--swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml8
-rw-r--r--swamid-sp-2.0.mxml1
-rw-r--r--swamid-testing-sp-1.0.mxml1
3 files changed, 9 insertions, 1 deletions
diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index 98804a06..6f2994cb 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" entityID="http://admin-tug-1.eduid.se:6544/saml2/metadata/">
+ <ns0: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/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </ns0:Extensions>
<ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<ns0:KeyDescriptor use="encryption">
<ns1:KeyInfo>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 47eb77b9..e9eab4ff 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -88,5 +88,4 @@
<xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
<xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>
<xi:include href="swamid-2.0/scalear-saml.herokuapp.com.xml"/>
- <xi:include href="swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index e72df305..72ca2a87 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -303,4 +303,5 @@
<xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
<xi:include href="swamid-1.0/sigma-test-localhost-sp-130705.xml"/>
<xi:include href="swamid-1.0/kisetest2.user.ki.se-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml"/>
</EntitiesDescriptor>