summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--swamid-2.0/idp.irf.se-idp-shibboleth.xml15
-rw-r--r--swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml47
-rw-r--r--swamid-edugain-idp-1.0.mxml2
-rw-r--r--swamid-idp-2.0.mxml2
4 files changed, 47 insertions, 19 deletions
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index ae28e676..ff589283 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.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:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">irf.se</shibmd:Scope>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (old)</mdui:DisplayName>
<mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
<mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
<mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
@@ -94,8 +101,8 @@ XCYbfP8E3cs4MB+K
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">IRF</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (old)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
</Organization>
<ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index 0dffd552..a2279075 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -1,19 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 (ny)</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (new)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
+ <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
+ <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
</mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>irf.se</mdui:DomainHint>
+ <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
+ <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor use="signing">
<ds:KeyInfo>
@@ -187,14 +196,26 @@ CQNfH97cIrTE5N/RQ7XWcw==
</AttributeAuthorityDescriptor>
<Organization>
<OrganizationName xml:lang="en">IRF</OrganizationName>
- <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (ny)</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (new)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
</Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Swedish Institute of Space Physics</Company>
+ <SurName>Mats Luspa</SurName>
+ <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
+ <TelephoneNumber>+4698079000</TelephoneNumber>
+ </ContactPerson>
<ContactPerson contactType="technical">
- <Company>Institutet för rymdfysik</Company>
+ <Company>Swedish Institute of Space Physics</Company>
+ <SurName>Mats Luspa</SurName>
+ <EmailAddress>mailto:matsl@irf.se</EmailAddress>
+ <TelephoneNumber>+4698079022</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
<EmailAddress>mailto:matsl@irf.se</EmailAddress>
- <TelephoneNumber>+46 980 79 022</TelephoneNumber>
+ <TelephoneNumber>+4698079022</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 57b92aeb..dd45fb19 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -20,7 +20,6 @@
<xi:include href="swamid-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml"/>
- <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp.bth.se-idp-shibboleth.xml"/>
@@ -52,4 +51,5 @@
<xi:include href="swamid-2.0/idpv3.lu.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
<xi:include href="swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml"/>
+ <xi:include href="swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml"/>
</md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 72a58d03..e03116d2 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -8,7 +8,7 @@
<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"/>
<xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
<xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
+ <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
</md:EntitiesDescriptor>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 10:44:26 +0000