diff options
| -rw-r--r-- | swamid-2.0/kiidp.ki.se-idp-shibboleth.xml | 15 | ||||
| -rw-r--r-- | swamid-2.0/login.ki.se-idp-shibboleth.xml | 28 | ||||
| -rw-r--r-- | swamid-edugain-idp-1.0.mxml | 2 | ||||
| -rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 37 insertions, 10 deletions
diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml index 9498c3af..fe5083d9 100644 --- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml +++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="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://kiidp.ki.se/idp/shibboleth"> <md:Extensions> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> + <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> </saml: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> </mdattr:EntityAttributes> </md:Extensions> <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <shibmd:Scope regexp="false">ki.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Karolinska Institutet (gammal)</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Karolinska Institutet (old)</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description> <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo> @@ -110,8 +113,8 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg== </md:AttributeAuthorityDescriptor> <md:Organization> <md:OrganizationName xml:lang="en">KI</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet (gammal)</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet (old)</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="administrative"> diff --git a/swamid-2.0/login.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml index d4d36393..7c8d2344 100644 --- a/swamid-2.0/login.ki.se-idp-shibboleth.xml +++ b/swamid-2.0/login.ki.se-idp-shibboleth.xml @@ -11,8 +11,8 @@ <Extensions> <shibmd:Scope regexp="false">ki.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Karolinska Institutet (endast nya Ladok)</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Karolinska Institutet (only new Ladok)</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description> <mdui:Logo height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo> @@ -203,4 +203,28 @@ BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/> <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> </AttributeAuthorityDescriptor> + <Organization> + <OrganizationName xml:lang="en">KI</OrganizationName> + <OrganizationDisplayName xml:lang="sv">Karolinska Institutet</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName> + <OrganizationURL xml:lang="en">http://www.ki.se</OrganizationURL> + </Organization> + <ContactPerson contactType="administrative"> + <Company>Karolinska Institutet</Company> + <SurName>Parisa Farzbod</SurName> + <EmailAddress>mailto:parisa.farzbod@ki.se</EmailAddress> + <TelephoneNumber>+46 8 524 86488</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="technical"> + <Company>Karolinska Institutet</Company> + <SurName>Eric Johansson</SurName> + <EmailAddress>mailto:eric.johansson@ki.se</EmailAddress> + <TelephoneNumber>+46 8 524 86382</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>Karolinska Institutet</Company> + <SurName>IT-support</SurName> + <EmailAddress>mailto:it-support@ki.se</EmailAddress> + <TelephoneNumber>+46 8 524 82222</TelephoneNumber> + </ContactPerson> </EntityDescriptor> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index e8fe2fc0..f10a7a6f 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -21,7 +21,6 @@ <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.kva.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/> @@ -49,4 +48,5 @@ <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index d503a3aa..175b2fe5 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -8,7 +8,6 @@ <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/login.ki.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/> @@ -19,4 +18,5 @@ <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |