diff options
-rw-r--r-- | swamid-2.0/idp.oru.se-idp-shibboleth.xml | 14 | ||||
-rw-r--r-- | swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml | 4 | ||||
-rw-r--r-- | swamid-edugain-idp-1.0.mxml | 1 | ||||
-rw-r--r-- | swamid-idp-2.0.mxml | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml index 12b1318b..1f94a00c 100644 --- a/swamid-2.0/idp.oru.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.oru.se-idp-shibboleth.xml @@ -4,10 +4,14 @@ <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"> <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> - <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> + <attr:EntityAttributes xmlns:attr="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"> + <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> + <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue> </saml: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-support"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + </samla:Attribute> </attr:EntityAttributes> </md:Extensions> <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" errorURL="https://idp.oru.se/identity/feedback.htm" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> @@ -15,8 +19,8 @@ <shibmd:Scope regexp="false">idp.oru.se</shibmd:Scope> <shibmd:Scope regexp="false">oru.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Örebro universitet - TEST</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Örebro University - TEST</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description> <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description> <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords> diff --git a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml index f5e46867..01b4ae95 100644 --- a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml +++ b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml @@ -18,8 +18,8 @@ <Extensions> <shibmd:Scope regexp="false">oru.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Örebro universitet - utfasad</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Örebro University - deprecated</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description> <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description> <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords> diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index dd4baba1..4c0841fb 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -51,4 +51,5 @@ <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/> + <xi:include href="swamid-2.0/idp.oru.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 9c3d4aee..b4ddb721 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -13,7 +13,7 @@ <xi:include href="swamid-2.0/adfs.sp.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/idpaas.swamid.se-idp.xml"/> <xi:include href="swamid-2.0/idpv4.lu.se-idp-shibboleth.xml"/> - <xi:include href="swamid-2.0/idp.oru.se-idp-shibboleth.xml"/> <xi:include href="swamid-2.0/sts.vinnova.se-adfs-services-trust.xml"/> <xi:include href="swamid-2.0/adfs.kb.se-adfs-services-trust.xml"/> + <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/> </md:EntitiesDescriptor> |