diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-03-17 17:11:49 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-03-17 17:11:49 +0100 |
| commit | 989d89b295ef51e88379a432dcb058130b94590b (patch) | |
| tree | 405ef19395e07328fe21e52f5feba77219ad69da | |
| parent | d1f6b4c66916e81cbe57f6f582a486b5f2e4220b (diff) | |
| parent | a73ecba94e19a51b7848b28869e4bcefaff4a4f6 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
148 files changed, 1051 insertions, 39 deletions
diff --git a/swamid-2.0/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml index f07836f7..e483bf25 100644 --- a/swamid-2.0/account.liu.se-shibboleth-sp.xml +++ b/swamid-2.0/account.liu.se-shibboleth-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml index 9658adc2..6ecfd33d 100644 --- a/swamid-2.0/account.mdh.se-shibboleth.xml +++ b/swamid-2.0/account.mdh.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/accountcheckout.lnu.se.xml b/swamid-2.0/accountcheckout.lnu.se.xml index 3c3196d0..51cb6132 100644 --- a/swamid-2.0/accountcheckout.lnu.se.xml +++ b/swamid-2.0/accountcheckout.lnu.se.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/accounts.bils.se-saml2-metadata.xml b/swamid-2.0/accounts.bils.se-saml2-metadata.xml index ea5f62b9..6a82ad2a 100644 --- a/swamid-2.0/accounts.bils.se-saml2-metadata.xml +++ b/swamid-2.0/accounts.bils.se-saml2-metadata.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml index bbeac6b1..855eabdf 100644 --- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml +++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </ns0:Extensions> diff --git a/swamid-2.0/akka-anv.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.uu.se-shibboleth.xml index ad77f731..be5cff4f 100644 --- a/swamid-2.0/akka-anv.uu.se-shibboleth.xml +++ b/swamid-2.0/akka-anv.uu.se-shibboleth.xml @@ -15,6 +15,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml index d9b23844..c01783b7 100644 --- a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml +++ b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml index 99b28e38..a25b4c06 100644 --- a/swamid-2.0/aktivera.ki.se-shibboleth.xml +++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml @@ -16,6 +16,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml index 9210c6a5..2e969227 100644 --- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml +++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/alpha.kib.ki.se-shibboleth.xml b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml index 778d36bb..0c66cdb1 100644 --- a/swamid-2.0/alpha.kib.ki.se-shibboleth.xml +++ b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/amiga.kib.ki.se-shibboleth.xml b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml index e78b7388..e2dd4210 100644 --- a/swamid-2.0/amiga.kib.ki.se-shibboleth.xml +++ b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 444be912..1d3eb57a 100644 --- a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml index d6a2b49e..9c0cab75 100644 --- a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml +++ b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml index 9b390527..fdea4d20 100644 --- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml +++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml @@ -20,6 +20,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/beta.kib.ki.se-shibboleth.xml b/swamid-2.0/beta.kib.ki.se-shibboleth.xml index 7eae8315..1a947f3a 100644 --- a/swamid-2.0/beta.kib.ki.se-shibboleth.xml +++ b/swamid-2.0/beta.kib.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/beta.lobber.se-shibboleth.xml b/swamid-2.0/beta.lobber.se-shibboleth.xml index 6ce5b31b..7ec5a132 100644 --- a/swamid-2.0/beta.lobber.se-shibboleth.xml +++ b/swamid-2.0/beta.lobber.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml index 198ac5d4..7355ce9f 100644 --- a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml +++ b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 58b9df4c..5a710ebf 100644 --- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 39b5b74a..575dfd20 100644 --- a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index dc82895c..db28bd58 100644 --- a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/swamid-2.0/confluence.its.umu.se-shibboleth.xml index 4b9b32ae..a3bce995 100644 --- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml +++ b/swamid-2.0/confluence.its.umu.se-shibboleth.xml @@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners. <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml index d48dc93e..8ad250f9 100644 --- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml +++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml index 476f4b44..c27c3f3d 100644 --- a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml +++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/connect-test.sunet.se-shibboleth.xml b/swamid-2.0/connect-test.sunet.se-shibboleth.xml index 419b83d1..10d4a20e 100644 --- a/swamid-2.0/connect-test.sunet.se-shibboleth.xml +++ b/swamid-2.0/connect-test.sunet.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml index 8202195c..a9fa2243 100644 --- a/swamid-2.0/connect.funet.fi-shibboleth.xml +++ b/swamid-2.0/connect.funet.fi-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml index f934124e..b22a4ec5 100644 --- a/swamid-2.0/connect.sunet.se-shibboleth.xml +++ b/swamid-2.0/connect.sunet.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/connect.uninett.no-shibboleth.xml b/swamid-2.0/connect.uninett.no-shibboleth.xml index db8b1dfe..42727275 100644 --- a/swamid-2.0/connect.uninett.no-shibboleth.xml +++ b/swamid-2.0/connect.uninett.no-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/converis.info-shibboleth.xml b/swamid-2.0/converis.info-shibboleth.xml index f8ddc1cd..16acbe43 100644 --- a/swamid-2.0/converis.info-shibboleth.xml +++ b/swamid-2.0/converis.info-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml index 61aa7284..87d04d3a 100644 --- a/swamid-2.0/crowd.nordu.net-shibboleth.xml +++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/dirg.org.umu.se-443-sp.xml b/swamid-2.0/dirg.org.umu.se-443-sp.xml new file mode 100644 index 00000000..13d4c6ab --- /dev/null +++ b/swamid-2.0/dirg.org.umu.se-443-sp.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dirg.org.umu.se:443/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dirg.org.umu.se:443/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG +A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt +dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT +AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww +CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA +dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ +szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN +l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd +5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ +A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB +xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9 +606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIICVzCCAcACCQCD0IEgR/GBozANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCQUMxDTALBgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzEMMAoG +A1UECwwDSVRTMQ0wCwYDVQQDDARESVJHMRowGAYJKoZIhvcNAQkBFgtkaXJnQHVt +dS5zZTAeFw0xNDAyMDcxNDI3MDBaFw0xNTAyMDcxNDI3MDBaMHAxCzAJBgNVBAYT +AnNlMQswCQYDVQQIDAJBQzENMAsGA1UEBwwEVW1lYTEMMAoGA1UECgwDSVRTMQww +CgYDVQQLDANJVFMxDTALBgNVBAMMBERJUkcxGjAYBgkqhkiG9w0BCQEWC2RpcmdA +dW11LnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbpaYV1RzKKYbWAJGQ +szgiUgrP16ODFpNJloj1Tm5FIYUbcetCbwbPp3417mHObQS7rBvTm/ZJe2bbnenN +l4qRZWZSwmXDvDeIinAxwkr4C/rK392TKfHMfej1hDL2IeCn5oY7Fl2DTjDTAjKd +5KBaTqwIh0J3sJxUICQFpQ0rFwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFhpGdSZ +A6gAcjDA5Wqd0HTtpqkWqEbVKPtxI0pBnFy4J5CARk43R2yn1sHH/HRNTuTcZEmB +xz6UWuCYykD4kDTwppQdXn4l3/RkA1NOLvSse3P3Db7JbK5EkjHRyWCRnhREloh9 +606LRX1Kc0uWKNEBRs6uN9VA9aiIHVHpRboU +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dirg.org.umu.se:443/acsredirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dirg.org.umu.se:443/acspost" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml index 7e8436c6..ecad6448 100644 --- a/swamid-2.0/e5.onthehub.com.xml +++ b/swamid-2.0/e5.onthehub.com.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml index 02dbc635..1d4417be 100644 --- a/swamid-2.0/epc.ub.uu.se-shibboleth.xml +++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/expert.antagning.se-ecs-sp.xml b/swamid-2.0/expert.antagning.se-ecs-sp.xml index ca819908..2684248b 100644 --- a/swamid-2.0/expert.antagning.se-ecs-sp.xml +++ b/swamid-2.0/expert.antagning.se-ecs-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml index d5cfe3a0..2ddf5dec 100644 --- a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml +++ b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml index e085bce8..94dd25a5 100644 --- a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml +++ b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/gallus.scilifelab.se-shibboleth.xml b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml index d6d75751..045eaec9 100644 --- a/swamid-2.0/gallus.scilifelab.se-shibboleth.xml +++ b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml @@ -16,6 +16,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 123687d6..825943b3 100644 --- a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml index 899fbfd5..c2b13ee7 100644 --- a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml +++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml index 33827785..375aac72 100644 --- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml +++ b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml @@ -13,6 +13,7 @@ <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DomainHint>hb.se</mdui:DomainHint> <mdui:IPHint>193.10.168.0/24</mdui:IPHint> <mdui:IPHint>193.10.169.0/24</mdui:IPHint> <mdui:IPHint>193.10.170.0/24</mdui:IPHint> @@ -34,7 +35,6 @@ <mdui:IPHint>193.11.71.0/24</mdui:IPHint> <mdui:IPHint>193.11.72.0/24</mdui:IPHint> <mdui:IPHint>193.11.73.0/24</mdui:IPHint> - <mdui:DomainHint>hb.se</mdui:DomainHint> <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint> </mdui:DiscoHints> </Extensions> @@ -131,7 +131,7 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL> </Organization> <ContactPerson contactType="technical"> - <Company>Högskolan i Borås</Company> + <Company>University of Borås</Company> <EmailAddress>mikael.furth@hb.se</EmailAddress> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 327f7250..248c827b 100644 --- a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml index d5f31464..2aec7172 100644 --- a/swamid-2.0/idp.hig.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml @@ -8,12 +8,15 @@ <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description> <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description> - <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo> + <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DomainHint>hig.se</mdui:DomainHint> <mdui:IPHint>130.243.0.0/20</mdui:IPHint> <mdui:IPHint>193.11.48.0/20</mdui:IPHint> + <mdui:IPHint>193.10.163.0/24</mdui:IPHint> <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint> <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint> </mdui:DiscoHints> @@ -94,10 +97,22 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>University of Gävle</Company> + <SurName>Network Operations</SurName> + <EmailAddress>nat@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Högskolan i Gävle</Company> - <GivenName>Network</GivenName> + <Company>University of Gävle</Company> <SurName>Operations</SurName> <EmailAddress>nat@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>University of Gävle</Company> + <SurName>IT Support</SurName> + <EmailAddress>itsupport@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml index 595ca01a..cba02ff3 100644 --- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml @@ -3,6 +3,20 @@ <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:Description xml:lang="sv">Identity Provider för Instititutet 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:UIInfo> + <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <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>67.84,20.41</mdui:GeolocationHint> + </mdui:DiscoHints> </Extensions> <KeyDescriptor> <ds:KeyInfo> @@ -80,9 +94,22 @@ dJt1/U0DjbFQsA/iA4d9R6U7wKQ6rbi2 <OrganizationDisplayName xml:lang="en">Institutet för Rymdfysik</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>datagruppen@irf,se</EmailAddress> + <TelephoneNumber>+4698079000</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Mats</GivenName> - <SurName>Luspa</SurName> + <Company>Swedish Institute of Space Physics</Company> + <SurName>Mats Luspa</SurName> + <EmailAddress>matsl@irf.se</EmailAddress> + <TelephoneNumber>+4698079022</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>Swedish Institute of Space Physics</Company> + <SurName>Mats Luspa</SurName> <EmailAddress>matsl@irf.se</EmailAddress> + <TelephoneNumber>+4698079022</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml index ba57ad76..f72b6560 100644 --- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml @@ -92,8 +92,21 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg== <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>University of Gothenburg</Company> + <SurName>Lena Ström</SurName> + <EmailAddress>lena.strom@gu.se</EmailAddress> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Göteborgs universitet</Company> + <Company>University of Gothenburg</Company> + <SurName>Pablo Millet</SurName> <EmailAddress>pablo.millet@gu.se</EmailAddress> + <TelephoneNumber>+46707104070</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>University of Gothenburg</Company> + <SurName>GU-Support</SurName> + <EmailAddress>support@gu.se</EmailAddress> + <TelephoneNumber>+46317862020</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml index 4482716b..38f73071 100644 --- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml +++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml @@ -4,8 +4,12 @@ <Extensions> <shibmd:Scope regexp="false">nordu.net</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName> + <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description> <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description> + <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo> + <mdui:Logo xml:lang="sv" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo> <mdui:Logo xml:lang="en" height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> @@ -88,8 +92,18 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE= <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>NORDUnet</Company> + <SurName>noc@nordu.net</SurName> + <EmailAddress>noc@nordu.net</EmailAddress> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>NORDUnet NOC</Company> + <Company>NORDUnet</Company> + <EmailAddress>noc@nordu.net</EmailAddress> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>NORDUnet</Company> + <SurName>NUNOC</SurName> <EmailAddress>noc@nordu.net</EmailAddress> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml index a27ec82f..0b39b408 100644 --- a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml @@ -8,7 +8,9 @@ <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description> <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description> - <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo> + <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo> </mdui:UIInfo> </Extensions> <KeyDescriptor> @@ -87,10 +89,22 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK <OrganizationDisplayName xml:lang="en">University of Gävle (Alumni)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>University of Gävle (Alumni)</Company> + <SurName>Network Operations</SurName> + <EmailAddress>nat@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Högskolan i Gävle</Company> - <GivenName>Network</GivenName> - <SurName>Operations</SurName> + <Company>University of Gävle (Alumni)</Company> + <SurName>Network Operations</SurName> <EmailAddress>nat@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>University of Gävle (Alumni)</Company> + <SurName>IT Support</SurName> + <EmailAddress>itsupport@hig.se</EmailAddress> + <TelephoneNumber>+46 26 648500</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml index d496f40b..00da66b2 100644 --- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml +++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml @@ -4,13 +4,20 @@ <Extensions> <shibmd:Scope regexp="false">kau.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Karlstads Universitet</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description> + <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL> <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DomainHint>kau.se</mdui:DomainHint> <mdui:IPHint>130.243.16.0/20</mdui:IPHint> <mdui:IPHint>193.10.162.0/24</mdui:IPHint> <mdui:IPHint>193.10.220.0/22</mdui:IPHint> @@ -19,7 +26,6 @@ <mdui:IPHint>193.11.148.0/22</mdui:IPHint> <mdui:IPHint>193.11.152.0/21</mdui:IPHint> <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint> - <mdui:DomainHint>kau.se</mdui:DomainHint> <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint> </mdui:DiscoHints> </Extensions> @@ -99,14 +105,22 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9 <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Karlstad University</Company> + <SurName>IT-avdelningen</SurName> + <EmailAddress>webbteknik@kau.se</EmailAddress> + <TelephoneNumber>+46 54 700 2200</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Paul</GivenName> - <SurName>Scott</SurName> + <Company>Karlstad University</Company> + <SurName>Paul Scott</SurName> <EmailAddress>paul.scott@kau.se</EmailAddress> + <TelephoneNumber>+46 54 700 2307</TelephoneNumber> </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Magnus</GivenName> - <SurName>Olsson</SurName> - <EmailAddress>magnus.olsson@kau.se</EmailAddress> + <ContactPerson contactType="support"> + <Company>Karlstad University</Company> + <SurName>IT-avdelningen Karlstads universitet</SurName> + <EmailAddress>datasupport@kau.se</EmailAddress> + <TelephoneNumber>+46 54 700 2200</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/jira.its.umu.se-shibboleth.xml b/swamid-2.0/jira.its.umu.se-shibboleth.xml index 51088150..c27ab8e4 100644 --- a/swamid-2.0/jira.its.umu.se-shibboleth.xml +++ b/swamid-2.0/jira.its.umu.se-shibboleth.xml @@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners. <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/kilw.ki.se-shibboleth.xml b/swamid-2.0/kilw.ki.se-shibboleth.xml index d976f71a..049d917b 100644 --- a/swamid-2.0/kilw.ki.se-shibboleth.xml +++ b/swamid-2.0/kilw.ki.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/kitstidp02.tst.ki.se.xml b/swamid-2.0/kitstidp02.tst.ki.se.xml index 07d27163..cd33feab 100644 --- a/swamid-2.0/kitstidp02.tst.ki.se.xml +++ b/swamid-2.0/kitstidp02.tst.ki.se.xml @@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners. <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/kurser.math.su.se-shibboleth.xml b/swamid-2.0/kurser.math.su.se-shibboleth.xml index 39717c24..2d2cf4de 100644 --- a/swamid-2.0/kurser.math.su.se-shibboleth.xml +++ b/swamid-2.0/kurser.math.su.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml index e60efbb0..09398204 100644 --- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml index 6687275a..27febdf2 100644 --- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml index d7e79b58..a6dd122a 100644 --- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml index f2318f76..ada06328 100644 --- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml index 72ef7bf0..6985bd5e 100644 --- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml index 6a0e71e3..d254a003 100644 --- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml index bd7415ac..ec57b6c7 100644 --- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml index 8f4e946d..3d0e6769 100644 --- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml +++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/lartorget.sll.se-shibbolet.xml b/swamid-2.0/lartorget.sll.se-shibbolet.xml index 58d62778..f3191acc 100644 --- a/swamid-2.0/lartorget.sll.se-shibbolet.xml +++ b/swamid-2.0/lartorget.sll.se-shibbolet.xml @@ -20,6 +20,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml index 97bdb37b..202637e5 100644 --- a/swamid-2.0/login.du.se-idp-shibboleth.xml +++ b/swamid-2.0/login.du.se-idp-shibboleth.xml @@ -8,13 +8,13 @@ <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName> <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description> <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description> - <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo> - <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo> <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="350" width="146">https://login.du.se/duse-logo-sv.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="350" width="146">https://login.du.se/duse-logo-en.png</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:IPHint>130.243.32.0/19</mdui:IPHint> <mdui:DomainHint>du.se</mdui:DomainHint> + <mdui:IPHint>130.243.32.0/19</mdui:IPHint> <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint> </mdui:DiscoHints> </Extensions> @@ -94,8 +94,22 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q== <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Dalarna University</Company> + <SurName>IT-avdelningen</SurName> + <EmailAddress>shib-admin@du.se</EmailAddress> + <TelephoneNumber>+46 23 778891</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Högskolan Dalarna</Company> - <EmailAddress>dempa@du.se</EmailAddress> + <Company>Dalarna University</Company> + <SurName>IT-avdelningen</SurName> + <EmailAddress>shib-admin@du.se</EmailAddress> + <TelephoneNumber>+46 23 778891</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>Dalarna University</Company> + <SurName>Högskolan Dalarna Support</SurName> + <EmailAddress>support@du.se</EmailAddress> + <TelephoneNumber>+46 23 778888</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml index 3d9d7b93..93efb096 100644 --- a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml +++ b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml index e4a7170e..5b9174a5 100644 --- a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml +++ b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/mailfilter.sunet.se-shibboleth.xml b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml index ff9d9ece..59f3ab0d 100644 --- a/swamid-2.0/mailfilter.sunet.se-shibboleth.xml +++ b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/maps.slu.se-shibboleth.xml b/swamid-2.0/maps.slu.se-shibboleth.xml index d3f5d372..20dbbaa9 100644 --- a/swamid-2.0/maps.slu.se-shibboleth.xml +++ b/swamid-2.0/maps.slu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml index 817184b3..f4919fb2 100644 --- a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml +++ b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml index dbbbc42a..2c01394c 100644 --- a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml +++ b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/meta.eduroam.se-shibboleth.xml b/swamid-2.0/meta.eduroam.se-shibboleth.xml index c1ad7c52..ef773802 100644 --- a/swamid-2.0/meta.eduroam.se-shibboleth.xml +++ b/swamid-2.0/meta.eduroam.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/meta.swamid.se-shibboleth.xml b/swamid-2.0/meta.swamid.se-shibboleth.xml new file mode 100644 index 00000000..88082277 --- /dev/null +++ b/swamid-2.0/meta.swamid.se-shibboleth.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.swamid.se/shibboleth"> + <md:Extensions> + <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> + <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> + <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> + <md:Extensions> + <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://meta.swamid.se/Shibboleth.sso/Login"/> + <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.swamid.se/Shibboleth.sso/Login" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Metadata service at SWAMID</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Metadata service at SWAMID</mdui:DisplayName> + </mdui:UIInfo> + </md:Extensions> + <md:KeyDescriptor> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:KeyName>meta.swamid.se</ds:KeyName> + <ds:X509Data> + <ds:X509SubjectName>CN=meta.swamid.se</ds:X509SubjectName> + <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAO86gLrkwwP3MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV +BAMTDm1ldGEuc3dhbWlkLnNlMB4XDTE0MDMxMzEyMjYzNloXDTI0MDMxMDEyMjYz +NlowGTEXMBUGA1UEAxMObWV0YS5zd2FtaWQuc2UwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQDZVfts97pzO7DCqNPgK3do1xRdwwJ85kbhzb0azMGZHTqh +BowZu+DgMPPeZ4/YFT8hO1HOoW9oEvV0qFgSrPYclFxTWrzlbHnika1wEBc8ukIX +mdjdI1yGrk3bh50DTnkljuWbnwYPiWARIzyEL3vT4HP+5z+If5T0eaaL7u6qNZX7 +DKqhPnyF0OKT8am6MnN/VGS1FehKOulnHrkVgOeb43Rf5YbMy/2+UT6noaaJb28/ +a4fwMp7uFJ7Nvx5O7AIeAmdy5eg5lqlHslQEIsD5K/KCRk1m2h0uMm5i6hSddjTR +e7p42tXVBb8UbSUFNdne8jO+IVajxXRlBPw4S/bXAgMBAAGjPDA6MBkGA1UdEQQS +MBCCDm1ldGEuc3dhbWlkLnNlMB0GA1UdDgQWBBTxCjCev8NEnf0Hqn+16Y9roCLU +SzANBgkqhkiG9w0BAQUFAAOCAQEAnjDzcj7BU2afxo5h6OtV4a7zhfBMeq3S3gyw +kLjbk1BRAJ7vWS2juhnVTP78g5sAkjIDbq/7V77mLBBt/7xqbwgOkPh5/i9lWTOV +LAwqyhW3dEAqDAKQ3oTKPQR9OiHZ3wShNvHU+/7jKeecEShKb9ZUgGZGYYF6VTz7 +VWDuymgW+e7fOSXixyTpB3ED7kg24w4WaM7n59xlA3+Y9E5d+snpf8e7yrqwCZP1 +ovvypDjeN1LIIK6K1u6a+IpQDdBgkes//gOqD5/RTR3RPSAhZu/46eoCWxX4o8Xx +4cWL7ZsFtqVIs30fEZPu0cco2tW8iiRcMYolr6q3vi5xtOH1Bg== +</ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + </md:KeyDescriptor> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.swamid.se/Shibboleth.sso/SLO/SOAP"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.swamid.se/Shibboleth.sso/SLO/Redirect"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.swamid.se/Shibboleth.sso/SLO/POST"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.swamid.se/Shibboleth.sso/SLO/Artifact"/> + <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meta.swamid.se/Shibboleth.sso/NIM/SOAP"/> + <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meta.swamid.se/Shibboleth.sso/NIM/Redirect"/> + <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.swamid.se/Shibboleth.sso/NIM/POST"/> + <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.swamid.se/Shibboleth.sso/NIM/Artifact"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meta.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meta.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meta.swamid.se/Shibboleth.sso/SAML/POST" index="5"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meta.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/> + </md:SPSSODescriptor> +</md:EntityDescriptor> diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml index 0d994373..ebe75042 100644 --- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml +++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/mondo.su.se-shibboleth.sso.xml b/swamid-2.0/mondo.su.se-shibboleth.sso.xml index 7f8174bd..f307fa53 100644 --- a/swamid-2.0/mondo.su.se-shibboleth.sso.xml +++ b/swamid-2.0/mondo.su.se-shibboleth.sso.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml index 19d95f1b..226e02b5 100644 --- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml +++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml @@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners. <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml index eef0e705..fff3c3bf 100644 --- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml +++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/nordunet.tv-shibboleth.xml b/swamid-2.0/nordunet.tv-shibboleth.xml index 16021d1e..38c09f74 100644 --- a/swamid-2.0/nordunet.tv-shibboleth.xml +++ b/swamid-2.0/nordunet.tv-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml index 16cbb132..17b0f19b 100644 --- a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml +++ b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> diff --git a/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml index bd905ffa..ac7811f7 100644 --- a/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml +++ b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml index 2c8e572e..56b85e80 100644 --- a/swamid-2.0/pingpong.ki.se-shibboleth.xml +++ b/swamid-2.0/pingpong.ki.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.hig.se-shibboleth.xml b/swamid-2.0/play.hig.se-shibboleth.xml index 27ca7f8b..1a5c616b 100644 --- a/swamid-2.0/play.hig.se-shibboleth.xml +++ b/swamid-2.0/play.hig.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.liu.se-shibboleth.xml b/swamid-2.0/play.liu.se-shibboleth.xml index e9d5fb58..a51f685d 100644 --- a/swamid-2.0/play.liu.se-shibboleth.xml +++ b/swamid-2.0/play.liu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.lu.se-shibboleth.xml b/swamid-2.0/play.lu.se-shibboleth.xml index 4e442228..7c5c58fc 100644 --- a/swamid-2.0/play.lu.se-shibboleth.xml +++ b/swamid-2.0/play.lu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml index 56f2e63c..dcf262f4 100644 --- a/swamid-2.0/play.mah.se-shibboleth.xml +++ b/swamid-2.0/play.mah.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.mdh.se-shibboleth.xml b/swamid-2.0/play.mdh.se-shibboleth.xml index 9028fbe8..68f5cab6 100644 --- a/swamid-2.0/play.mdh.se-shibboleth.xml +++ b/swamid-2.0/play.mdh.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/play.sunet.se-shibboleth.xml b/swamid-2.0/play.sunet.se-shibboleth.xml index e8e303fd..31988292 100644 --- a/swamid-2.0/play.sunet.se-shibboleth.xml +++ b/swamid-2.0/play.sunet.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml index 091c33e8..a69f0303 100644 --- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml +++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/problem.math.su.se-shibboleth.xml b/swamid-2.0/problem.math.su.se-shibboleth.xml index eedade4b..71f04c34 100644 --- a/swamid-2.0/problem.math.su.se-shibboleth.xml +++ b/swamid-2.0/problem.math.su.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/registrera.hb.se-shibboleth.xml b/swamid-2.0/registrera.hb.se-shibboleth.xml index 8e093258..74973c2b 100644 --- a/swamid-2.0/registrera.hb.se-shibboleth.xml +++ b/swamid-2.0/registrera.hb.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml index 23558a64..218fa931 100644 --- a/swamid-2.0/rems.csc.fi.xml +++ b/swamid-2.0/rems.csc.fi.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/samltest.swamid.se-coc-sp.xml b/swamid-2.0/samltest.swamid.se-coc-sp.xml new file mode 100644 index 00000000..cfdd1206 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-coc-sp.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/coc/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/coc/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/coc/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-nren-sp.xml b/swamid-2.0/samltest.swamid.se-nren-sp.xml new file mode 100644 index 00000000..88c158f4 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-nren-sp.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/nren/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/nren/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/nren/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml new file mode 100644 index 00000000..f7998bd5 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/r_and_s/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://id.incommon.org/category/research-and-scholarship</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:KeyDescriptor use="encryption"> + <ns4:KeyInfo> + <ns4:X509Data> + <ns4:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns4:X509Certificate> + </ns4:X509Data> + </ns4:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns4:KeyInfo> + <ns4:X509Data> + <ns4:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns4:X509Certificate> + </ns4:X509Data> + </ns4:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/r_and_s/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/r_and_s/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml new file mode 100644 index 00000000..53e62418 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/re_eu/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_eu/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_eu/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml new file mode 100644 index 00000000..168ccf9b --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/re_hei/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_hei/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_hei/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml new file mode 100644 index 00000000..5cc5323f --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/re_nren/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_nren/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_nren/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml new file mode 100644 index 00000000..fb34ddc5 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/re_nren_sfs/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/re_nren_sfs/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/re_nren_sfs/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-sfs-sp.xml b/swamid-2.0/samltest.swamid.se-sfs-sp.xml new file mode 100644 index 00000000..f8f9d0fe --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-sfs-sp.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/sfs/sp.xml"> + <ns0:Extensions> + <ns1:EntityAttributes> + <ns2:Attribute Name="http://macedir.org/entity-category"> + <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue> + </ns2:Attribute> + </ns1:EntityAttributes> + </ns0:Extensions> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns5:KeyInfo> + <ns5:X509Data> + <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns5:X509Certificate> + </ns5:X509Data> + </ns5:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/sfs/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/sfs/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/samltest.swamid.se-sp.xml b/swamid-2.0/samltest.swamid.se-sp.xml new file mode 100644 index 00000000..bc7046c8 --- /dev/null +++ b/swamid-2.0/samltest.swamid.se-sp.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://samltest.swamid.se/sp.xml"> + <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <ns0:Extensions> + <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://samltest.swamid.se/disco" index="1"/> + </ns0:Extensions> + <ns0:KeyDescriptor use="encryption"> + <ns2:KeyInfo> + <ns2:X509Data> + <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns2:X509Certificate> + </ns2:X509Data> + </ns2:KeyInfo> + </ns0:KeyDescriptor> + <ns0:KeyDescriptor use="signing"> + <ns2:KeyInfo> + <ns2:X509Data> + <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz +ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN +MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx +CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE +CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U +VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT +EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ +pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke +P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN +Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB +AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90 +6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI +idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1 +5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm +xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6 +Z3dVKh4xfib5HaL6Bl2ks8LF +</ns2:X509Certificate> + </ns2:X509Data> + </ns2:KeyInfo> + </ns0:KeyDescriptor> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/redirect" index="1"/> + <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/post" index="2"/> + </ns0:SPSSODescriptor> +</ns0:EntityDescriptor> diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml index f4a88b29..45171085 100644 --- a/swamid-2.0/scalear-saml.herokuapp.com.xml +++ b/swamid-2.0/scalear-saml.herokuapp.com.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/sdauth.sciencedirect.com.xml b/swamid-2.0/sdauth.sciencedirect.com.xml index 9f89882d..c3cd3fab 100644 --- a/swamid-2.0/sdauth.sciencedirect.com.xml +++ b/swamid-2.0/sdauth.sciencedirect.com.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </Extensions> diff --git a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml index 7b9ff508..4aae26b8 100644 --- a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml +++ b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml index 9f387594..e549c98e 100644 --- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml +++ b/swamid-2.0/se.timeedit.net-umu-student-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml index 7d93e856..ab12bb2f 100644 --- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml +++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml index e89ef6ed..089b5568 100644 --- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml +++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml index d07c32fe..f5d746ae 100644 --- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml +++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml @@ -4,13 +4,15 @@ <Extensions> <shibmd:Scope regexp="false">oru.se</shibmd:Scope> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Örebro Universitet</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName> - <mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description> + <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:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo> </mdui:UIInfo> <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DomainHint>oru.se</mdui:DomainHint> + <mdui:IPHint>130.243.96.0/19</mdui:IPHint> <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint> <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint> </mdui:DiscoHints> @@ -87,14 +89,22 @@ Pz8R3A==</ds:X509Certificate> <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Örebro University</Company> + <SurName>IT Avdelningen</SurName> + <EmailAddress>itsupport@oru.se</EmailAddress> + <TelephoneNumber>+46 19 303166</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <GivenName>Jonny</GivenName> - <SurName>Ehrnberg</SurName> + <Company>Örebro University</Company> + <SurName>Jonny Ehrnberg</SurName> <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress> + <TelephoneNumber>+46 19 303851</TelephoneNumber> </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Mikael</GivenName> - <SurName>Borjesson</SurName> - <EmailAddress>mikael.borjesson@oru.se</EmailAddress> + <ContactPerson contactType="support"> + <Company>Örebro University</Company> + <SurName>IT Avdelningen Örebro universitet</SurName> + <EmailAddress>itsupport@oru.se</EmailAddress> + <TelephoneNumber>+46 19 303166</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml index d134db49..3686f3f4 100644 --- a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml +++ b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml @@ -92,8 +92,16 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g== <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Jönköping University</Company> + <SurName>Joakim Danielsson</SurName> + <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress> + <TelephoneNumber>+46 36 101116</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Högskolan i Jönköping</Company> + <Company>Jönköping University</Company> + <SurName>Stefan Kindh</SurName> <EmailAddress>Stefan.Kindh@hj.se</EmailAddress> + <TelephoneNumber>+46 36 101170</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml index b0a85eed..df80007f 100644 --- a/swamid-2.0/shibboleth.ebscohost.com.xml +++ b/swamid-2.0/shibboleth.ebscohost.com.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml index 38ae9b4f..b3069204 100644 --- a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml +++ b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/shibdev.rsc.org-shibboleth.xml b/swamid-2.0/shibdev.rsc.org-shibboleth.xml index 8f19deda..e529dcc9 100644 --- a/swamid-2.0/shibdev.rsc.org-shibboleth.xml +++ b/swamid-2.0/shibdev.rsc.org-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/sp-test.swamid.se-shibboleth.xml b/swamid-2.0/sp-test.swamid.se-shibboleth.xml index 120eb1ca..067fdb2b 100644 --- a/swamid-2.0/sp-test.swamid.se-shibboleth.xml +++ b/swamid-2.0/sp-test.swamid.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/sp.it.gu.se-shibboleth.xml b/swamid-2.0/sp.it.gu.se-shibboleth.xml index 09637b34..0f850c89 100644 --- a/swamid-2.0/sp.it.gu.se-shibboleth.xml +++ b/swamid-2.0/sp.it.gu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml index 6a5be909..aa283726 100644 --- a/swamid-2.0/sp.swamid.se-shibboleth.xml +++ b/swamid-2.0/sp.swamid.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml index ea080dd6..7d186258 100644 --- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml +++ b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml @@ -4,6 +4,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </md:Extensions> <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> diff --git a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index 0f786a7a..332cc89e 100644 --- a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index 98a65222..edbaf8b9 100644 --- a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index 32e5b1b0..45be03fd 100644 --- a/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index a29adacf..e6cdb7e7 100644 --- a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -6,6 +6,7 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml index 0145cd7a..2796e04f 100644 --- a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml +++ b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml @@ -15,6 +15,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml index 07028847..35c7b9ad 100644 --- a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml +++ b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml @@ -16,6 +16,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/ugit.se-sp.xml b/swamid-2.0/ugit.se-sp.xml index 4146e2f6..e191773b 100644 --- a/swamid-2.0/ugit.se-sp.xml +++ b/swamid-2.0/ugit.se-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/uraccess.se-shibboleth-sp.xml b/swamid-2.0/uraccess.se-shibboleth-sp.xml index c505c461..15f4eb14 100644 --- a/swamid-2.0/uraccess.se-shibboleth-sp.xml +++ b/swamid-2.0/uraccess.se-shibboleth-sp.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml index 466fd2b3..9db7884b 100644 --- a/swamid-2.0/urn-urkund-shibboleth-sp.xml +++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml index 1cbd7e2a..01cd3966 100644 --- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml +++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml @@ -3,6 +3,23 @@ <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">miun.se</shibmd:Scope> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Mid Sweden University</mdui:DisplayName> + <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter hos Mittuniversitetet</mdui:Description> + <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description> + <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL> + <mdui:Logo xml:lang="sv" height="78" width="163">http://www.miun.se/ImageVaultFiles/id_1159/cf_8/st_edited/Ja6nj94q_hdlyUdjZ6u0.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="78" width="163">http://www.miun.se/ImageVaultFiles/id_1159/cf_8/st_edited/Ja6nj94q_hdlyUdjZ6u0.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL> + </mdui:UIInfo> + <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DomainHint>miun.se</mdui:DomainHint> + <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint> + <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint> + <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint> + </mdui:DiscoHints> </Extensions> <KeyDescriptor> <ds:KeyInfo> @@ -80,8 +97,22 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ== <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Mid Sweden University</Company> + <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName> + <EmailAddress>SystemDriftIT@miun.se</EmailAddress> + <TelephoneNumber>+46 771 975 000</TelephoneNumber> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Mittuniversitetet</Company> + <Company>Mid Sweden University</Company> + <SurName>Ove Olander</SurName> <EmailAddress>Ove.Olander@miun.se</EmailAddress> + <TelephoneNumber>+46 63 165787</TelephoneNumber> + </ContactPerson> + <ContactPerson contactType="support"> + <Company>Mid Sweden University</Company> + <SurName>IT Helpdesk</SurName> + <EmailAddress>helpdesk@miun.se</EmailAddress> + <TelephoneNumber>+46 771 976130</TelephoneNumber> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml index a5e63a07..cf911aa1 100644 --- a/swamid-2.0/webinar.nordu.net-shibboleth.xml +++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml index 41a5510f..a14d88d1 100644 --- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml +++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml @@ -10,7 +10,9 @@ <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description> <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL> <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL> - <mdui:Logo height="125" width="125">https://weblogin.uu.se/uu_img/uulogo_lightgrey.gif</mdui:Logo> + <mdui:Logo height="102" width="102">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="102" width="102">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo> + <mdui:Logo xml:lang="en" height="102" width="102">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo> <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL> <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL> </mdui:UIInfo> @@ -104,9 +106,20 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ== <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL> </Organization> + <ContactPerson contactType="administrative"> + <Company>Uppsala University</Company> + <SurName>SAML2 admins</SurName> + <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> + </ContactPerson> <ContactPerson contactType="technical"> - <Company>Uppsala universitet</Company> - <SurName>AKKA SAML2</SurName> + <Company>Uppsala University</Company> + <SurName>SAML2 admins</SurName> <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> </ContactPerson> + <ContactPerson contactType="support"> + <Company>Uppsala University</Company> + <SurName>Helpdesk</SurName> + <EmailAddress>helpdesk@uu.se</EmailAddress> + <TelephoneNumber>+46184717890</TelephoneNumber> + </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml index 0f4b53bd..b9d1e1b3 100644 --- a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml +++ b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml @@ -19,6 +19,7 @@ and do *NOT* provide it in real time to your partners. <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml index c586dc55..c14c7fa1 100644 --- a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml +++ b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml @@ -15,6 +15,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml index bc406b7b..5be19988 100644 --- a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml +++ b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> diff --git a/swamid-2.0/www.antagning.se-aws-sp.xml b/swamid-2.0/www.antagning.se-aws-sp.xml index aea35d7a..ca6fa199 100644 --- a/swamid-2.0/www.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.antagning.se-aws-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.antagning.se-ecs-sp.xml b/swamid-2.0/www.antagning.se-ecs-sp.xml index 79886fde..1b86701f 100644 --- a/swamid-2.0/www.antagning.se-ecs-sp.xml +++ b/swamid-2.0/www.antagning.se-ecs-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/www.diva-portal.org-shibboleth.xml b/swamid-2.0/www.diva-portal.org-shibboleth.xml index 581a1cd1..649e1f58 100644 --- a/swamid-2.0/www.diva-portal.org-shibboleth.xml +++ b/swamid-2.0/www.diva-portal.org-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/www.ifmsa.se-sp.xml b/swamid-2.0/www.ifmsa.se-sp.xml index 0c010a42..c5e135f7 100644 --- a/swamid-2.0/www.ifmsa.se-sp.xml +++ b/swamid-2.0/www.ifmsa.se-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml index 47af38e8..1d6551db 100644 --- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml +++ b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml @@ -15,6 +15,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml index 5d051e60..aa81cb2c 100644 --- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml +++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml @@ -15,6 +15,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.play.umu.se-shibboleth.xml b/swamid-2.0/www.play.umu.se-shibboleth.xml index 7f178bc0..c05044d6 100644 --- a/swamid-2.0/www.play.umu.se-shibboleth.xml +++ b/swamid-2.0/www.play.umu.se-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/www.testa.antagning.se-aws-sp.xml b/swamid-2.0/www.testa.antagning.se-aws-sp.xml index a3dbd377..1d6d1338 100644 --- a/swamid-2.0/www.testa.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.testa.antagning.se-aws-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml index 23ada522..c46a1559 100644 --- a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.testb.antagning.se-aws-sp.xml b/swamid-2.0/www.testb.antagning.se-aws-sp.xml index a96310f9..e25488e6 100644 --- a/swamid-2.0/www.testb.antagning.se-aws-sp.xml +++ b/swamid-2.0/www.testb.antagning.se-aws-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> diff --git a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml index 8f15a786..c6ff84c3 100644 --- a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla: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://www.swamid.se/assurance-requirement"> diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml index 6f23e667..fba8946a 100644 --- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml +++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml index 426edcd7..8d742fee 100644 --- a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml +++ b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml @@ -4,6 +4,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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"> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml index d8f5e1fe..31cc7354 100644 --- a/swamid-2.0/www3.genuinetext.com-shibboleth.xml +++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </Extensions> diff --git a/swamid-2.0/www4.genuinetext.com-shibboleth.xml b/swamid-2.0/www4.genuinetext.com-shibboleth.xml index 8f6d8288..facfeb41 100644 --- a/swamid-2.0/www4.genuinetext.com-shibboleth.xml +++ b/swamid-2.0/www4.genuinetext.com-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml index e65e8d46..14855723 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml @@ -4,6 +4,7 @@ <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"> <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category"> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> </ns2:Attribute> </ns1:EntityAttributes> </ns0:Extensions> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml index 62bb7329..bca61fb9 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml @@ -4,6 +4,7 @@ <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"> <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category"> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue> </ns2:Attribute> </ns1:EntityAttributes> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml index 102552e2..a1839e19 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml @@ -4,6 +4,7 @@ <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"> <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category"> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue> </ns2:Attribute> </ns1:EntityAttributes> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml index 2e95fe13..31820cd1 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml @@ -4,6 +4,7 @@ <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"> <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category"> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue> </ns2:Attribute> </ns1:EntityAttributes> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml index 480693f1..26c4e7ce 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml @@ -4,6 +4,7 @@ <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute"> <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category"> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue> + <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue> <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue> </ns2:Attribute> diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml index e295f8ee..ff7d58af 100644 --- a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml +++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> diff --git a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml index 952b04bc..2fd0b98b 100644 --- a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml +++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml @@ -5,6 +5,7 @@ <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"> <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </Extensions> diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 7d21070a..ba1a5cb6 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -278,4 +278,15 @@ <xi:include href="swamid-2.0/accounts.bils.se-saml2-metadata.xml"/> <xi:include href="swamid-2.0/cas.weblogin.uu.se-cas.xml"/> <xi:include href="swamid-2.0/nagios.nordu.net-8087-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-coc-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-nren-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-re_eu-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-re_hei-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-re_nren-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-sfs-sp.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-sp.xml"/> + <xi:include href="swamid-2.0/meta.swamid.se-shibboleth.xml"/> + <xi:include href="swamid-2.0/samltest.swamid.se-r_and_s-sp.xml"/> + <xi:include href="swamid-2.0/dirg.org.umu.se-443-sp.xml"/> </md:EntitiesDescriptor> |