summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml23
-rw-r--r--swamid-idp-2.0.mxml1
-rw-r--r--swamid-testing-idp-1.0.mxml1
3 files changed, 12 insertions, 13 deletions
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index 078c50e2..0dffd552 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This is example metadata only. Do *NOT* supply it as is without review,
- and do *NOT* provide it in real time to your partners.
-
- This metadata is not dynamic - it will not change as your configuration changes.
--->
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idpshibboleth.irf.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+ <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+ </saml:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
<Extensions>
<shibmd:Scope regexp="false">irf.se</shibmd:Scope>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik Shib 3 test</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics Shib 3 test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik (ny)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (new)</mdui:DisplayName>
</mdui:UIInfo>
</Extensions>
<KeyDescriptor use="signing">
@@ -183,13 +184,11 @@ CQNfH97cIrTE5N/RQ7XWcw==
</ds:KeyInfo>
</KeyDescriptor>
<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
- <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpshibboleth.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
- <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">IRF</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik Shib 3 test</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics Shib 3 test</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (ny)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (new)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index aad6e0a0..585f49d1 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -8,4 +8,5 @@
<xi:include href="swamid-2.0/shibboleth.antagning.se-shibboleth-idp.xml"/>
<xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index eed4078f..87720b0e 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -47,7 +47,6 @@
<xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.fhs.se-swamid.xml"/>
<xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
- <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>