diff options
| author | Björn Mattsson <bjorn@sunet.se> | 2022-11-08 12:17:25 +0100 |
|---|---|---|
| committer | Björn Mattsson <bjorn@sunet.se> | 2022-11-08 12:17:25 +0100 |
| commit | 22e17e5de1ac4ab2d4a887fd8ff5acf61c922488 (patch) | |
| tree | bc8b686a685ec520fc1be6144d903129ec897660 | |
| parent | 132bec65d23825a926180c0b475c2959e2e806dc (diff) | |
Added ECS for ECS and R&S for IdP:s that is missing but have OK in release-check
30 files changed, 42 insertions, 0 deletions
diff --git a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml index 78f44842..f8399e31 100644 --- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml @@ -9,6 +9,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml index b4eaf399..a113c779 100644 --- a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml @@ -13,6 +13,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml index b04c309f..990b36e4 100644 --- a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml @@ -9,6 +9,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml index 0fd4de51..acf198f8 100644 --- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml +++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml @@ -11,6 +11,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml index ac38e61e..8b743f74 100644 --- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml +++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue> diff --git a/swamid-2.0/idp-shib.slu.se-idp.xml b/swamid-2.0/idp-shib.slu.se-idp.xml index 6b8d2ad7..b522019d 100644 --- a/swamid-2.0/idp-shib.slu.se-idp.xml +++ b/swamid-2.0/idp-shib.slu.se-idp.xml @@ -9,6 +9,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp-shibtest.slu.se-idp.xml b/swamid-2.0/idp-shibtest.slu.se-idp.xml index 8e02d646..a628830f 100644 --- a/swamid-2.0/idp-shibtest.slu.se-idp.xml +++ b/swamid-2.0/idp-shibtest.slu.se-idp.xml @@ -6,6 +6,7 @@ </mdrpi:RegistrationInfo> <mdattr:EntityAttributes> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml index 6197c79f..98abd4c9 100644 --- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml +++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml @@ -13,6 +13,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml index 06fe97ed..01723001 100644 --- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml @@ -9,6 +9,10 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> + <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> + </samla: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" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&errorurl_ts=ERRORURL_TS&errorurl_rp=ERRORURL_RP&errorurl_tid=ERRORURL_TID&errorurl_ctx=ERRORURL_CTX&entityid=https://idp.esh.se/idp/shibboleth"> diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml index f85c8641..204c3d03 100644 --- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml @@ -10,6 +10,8 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue> diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml index c5c4ce82..82eddb09 100644 --- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml index 48e67cc1..5233c094 100644 --- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml index 5b2fc268..1e7009e6 100644 --- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml index 7d45f210..2d02afb1 100644 --- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml @@ -9,6 +9,10 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> + <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> + </samla: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" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&errorurl_ts=ERRORURL_TS&errorurl_rp=ERRORURL_RP&errorurl_tid=ERRORURL_TID&errorurl_ctx=ERRORURL_CTX&entityid=https://idp.kmh.se/idp/shibboleth"> diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml index 501c6da2..733a3a47 100644 --- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml @@ -9,6 +9,9 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> + <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + </samla: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" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&errorurl_ts=ERRORURL_TS&errorurl_rp=ERRORURL_RP&errorurl_tid=ERRORURL_TID&errorurl_ctx=ERRORURL_CTX&entityid=https://idp.kva.se/idp/shibboleth"> diff --git a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml index b269c656..dec28a76 100644 --- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml index 83f9c291..d76c45c8 100644 --- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue> diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml index 79fe7c97..5d318823 100644 --- a/swamid-2.0/idp.oru.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.oru.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml index df2ea449..089161ac 100644 --- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml +++ b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue> diff --git a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml index fe75ed6f..256e38db 100644 --- a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml index b3d11e05..3b8255c0 100644 --- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml @@ -9,6 +9,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml index e4ef5263..123a4398 100644 --- a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml +++ b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml @@ -6,6 +6,8 @@ </mdrpi:RegistrationInfo> <mdattr:EntityAttributes> <samla:Attribute 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:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml index 0c167bce..da2a5320 100644 --- a/swamid-2.0/login.du.se-idp-shibboleth.xml +++ b/swamid-2.0/login.du.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml index e574d36b..8a1f541a 100644 --- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml +++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml @@ -14,6 +14,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/login2.fhs.se-adfs-services-trust.xml b/swamid-2.0/login2.fhs.se-adfs-services-trust.xml index 626b0dcd..147d3d89 100644 --- a/swamid-2.0/login2.fhs.se-adfs-services-trust.xml +++ b/swamid-2.0/login2.fhs.se-adfs-services-trust.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml index 7c919ea9..f5298b88 100644 --- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml +++ b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml index 9091dfa1..87fce1d4 100644 --- a/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml +++ b/swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml @@ -6,6 +6,7 @@ </mdrpi:RegistrationInfo> <mdattr:EntityAttributes> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/sts.mah.se-adfs-services-trust.xml b/swamid-2.0/sts.mah.se-adfs-services-trust.xml index 7b8d6126..5f343f48 100644 --- a/swamid-2.0/sts.mah.se-adfs-services-trust.xml +++ b/swamid-2.0/sts.mah.se-adfs-services-trust.xml @@ -10,6 +10,7 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> diff --git a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml index ea61d54d..3d098e1d 100644 --- a/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml +++ b/swamid-2.0/testidpv4.lu.se-idp-shibboleth.xml @@ -14,6 +14,7 @@ <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue> </samla:Attribute> <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml index 3367c41b..180567d7 100644 --- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml +++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml @@ -9,6 +9,9 @@ <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue> </samla:Attribute> + <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&errorurl_ts=ERRORURL_TS&errorurl_rp=ERRORURL_RP&errorurl_tid=ERRORURL_TID&errorurl_ctx=ERRORURL_CTX&entityid=http://webproxysrv.uniarts.se/adfs/services/trust"> |