diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-08-07 10:34:46 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-08-07 10:34:46 +0200 |
| commit | dcb542ee16efeeca0b5b5b77e60117482e18889a (patch) | |
| tree | 6518b4fefe7e07744a7cf13ad6d2dba171e9a5c2 | |
| parent | 1615289a0c58b213b13ea06c9f97a3da0c16fb31 (diff) | |
entity categories should be located in EntityDescriptor/Extensiosn
mdui should be located in EntityDescriptor/SPSSODescriptor/Extensiosn
66 files changed, 513 insertions, 439 deletions
diff --git a/swamid-1.0/account.liu.se-shibboleth-sp.xml b/swamid-1.0/account.liu.se-shibboleth-sp.xml index 0f649aa2..f07836f7 100644 --- a/swamid-1.0/account.liu.se-shibboleth-sp.xml +++ b/swamid-1.0/account.liu.se-shibboleth-sp.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://account.liu.se/shibboleth-sp"> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:KeyName>account.liu.se</ds:KeyName> diff --git a/swamid-1.0/account.mdh.se-shibboleth.xml b/swamid-1.0/account.mdh.se-shibboleth.xml index be1a41ba..9658adc2 100644 --- a/swamid-1.0/account.mdh.se-shibboleth.xml +++ b/swamid-1.0/account.mdh.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.mdh.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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://account.mdh.se/Shibboleth.sso/DS" index="1"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Kontoaktivering Mälardalens högskola</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Account activation Mälardalen University</mdui:DisplayName> diff --git a/swamid-1.0/accountcheckout.lnu.se.xml b/swamid-1.0/accountcheckout.lnu.se.xml index 80fb7751..3c3196d0 100644 --- a/swamid-1.0/accountcheckout.lnu.se.xml +++ b/swamid-1.0/accountcheckout.lnu.se.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accountcheckout.lnu.se"> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>accountcheckout.lnu.se</ds:KeyName> diff --git a/swamid-1.0/alpha.kib.ki.se-shibboleth.xml b/swamid-1.0/alpha.kib.ki.se-shibboleth.xml index 79f3a22e..778d36bb 100644 --- a/swamid-1.0/alpha.kib.ki.se-shibboleth.xml +++ b/swamid-1.0/alpha.kib.ki.se-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://alpha.kib.ki.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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor AuthnRequestsSigned="1" 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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>alpha.kib.ki.se</ds:KeyName> diff --git a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml b/swamid-1.0/amiga.kib.ki.se-shibboleth.xml index 7f356f33..e78b7388 100644 --- a/swamid-1.0/amiga.kib.ki.se-shibboleth.xml +++ b/swamid-1.0/amiga.kib.ki.se-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://amiga.kib.ki.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/hei-service</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://amiga.kib.ki.se/Shibboleth.sso/Login"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/bardo.kib.ki.se-shibboleth.xml b/swamid-1.0/bardo.kib.ki.se-shibboleth.xml index d72a8158..d6a2b49e 100644 --- a/swamid-1.0/bardo.kib.ki.se-shibboleth.xml +++ b/swamid-1.0/bardo.kib.ki.se-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bardo.kib.ki.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/hei-service</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/beta.kib.ki.se-shibboleth.xml b/swamid-1.0/beta.kib.ki.se-shibboleth.xml index 430901ed..7eae8315 100644 --- a/swamid-1.0/beta.kib.ki.se-shibboleth.xml +++ b/swamid-1.0/beta.kib.ki.se-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.kib.ki.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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor AuthnRequestsSigned="1" 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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>samadhi</ds:KeyName> diff --git a/swamid-1.0/beta.lobber.se-shibboleth.xml b/swamid-1.0/beta.lobber.se-shibboleth.xml index 0292f41b..6ce5b31b 100644 --- a/swamid-1.0/beta.lobber.se-shibboleth.xml +++ b/swamid-1.0/beta.lobber.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.lobber.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.lobber.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://beta.lobber.se/Shibboleth.sso/DS/kalmar2" index="2"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/bibliometrics.ki.se-shibboleth.xml b/swamid-1.0/bibliometrics.ki.se-shibboleth.xml index e2a86955..198ac5d4 100644 --- a/swamid-1.0/bibliometrics.ki.se-shibboleth.xml +++ b/swamid-1.0/bibliometrics.ki.se-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bibliometrics.ki.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/hei-service</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>dakini</ds:KeyName> diff --git a/swamid-1.0/connect.sunet.se-shibboleth.xml b/swamid-1.0/connect.sunet.se-shibboleth.xml index d90ab9d8..f934124e 100644 --- a/swamid-1.0/connect.sunet.se-shibboleth.xml +++ b/swamid-1.0/connect.sunet.se-shibboleth.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/nordu.net" index="3"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/connect.uninett.no-shibboleth.xml b/swamid-1.0/connect.uninett.no-shibboleth.xml index f22ddbbc..db8b1dfe 100644 --- a/swamid-1.0/connect.uninett.no-shibboleth.xml +++ b/swamid-1.0/connect.uninett.no-shibboleth.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.uninett.no/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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/ds.sunet.se" index="2"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.uninett.no/Shibboleth.sso/DS/kalmar2" index="3"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/converis.info-shibboleth.xml b/swamid-1.0/converis.info-shibboleth.xml index 06e7a23d..f8ddc1cd 100644 --- a/swamid-1.0/converis.info-shibboleth.xml +++ b/swamid-1.0/converis.info-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://converis.info/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/eu-adequate-protection</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> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>converis.info</ds:KeyName> diff --git a/swamid-1.0/crowd.nordu.net-shibboleth.xml b/swamid-1.0/crowd.nordu.net-shibboleth.xml index 69a18d4d..61aa7284 100644 --- a/swamid-1.0/crowd.nordu.net-shibboleth.xml +++ b/swamid-1.0/crowd.nordu.net-shibboleth.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.nordu.net/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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml b/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml index 835f2891..ed639a43 100644 --- a/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml +++ b/swamid-1.0/downloads.channel8.msdn.com-shibboleth-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </Extensions> <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 http://schemas.xmlsoap.org/ws/2003/07/secext"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </Extensions> <KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>www.dreamspark.com</ds:KeyName> diff --git a/swamid-1.0/expert.antagning.se-ecs-sp.xml b/swamid-1.0/expert.antagning.se-ecs-sp.xml index 18824c1f..ca819908 100644 --- a/swamid-1.0/expert.antagning.se-ecs-sp.xml +++ b/swamid-1.0/expert.antagning.se-ecs-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://expert.antagning.se/ecs-sp"> + <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/eu-adequate-protection</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> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>expert.antagning.se</ds:KeyName> diff --git a/swamid-1.0/gallus.scilifelab.se-shibboleth.xml b/swamid-1.0/gallus.scilifelab.se-shibboleth.xml index 0b9d7878..d6d75751 100644 --- a/swamid-1.0/gallus.scilifelab.se-shibboleth.xml +++ b/swamid-1.0/gallus.scilifelab.se-shibboleth.xml @@ -12,6 +12,12 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> + <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/eu-adequate-protection</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> @@ -20,12 +26,6 @@ <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://gallus.scilifelab.se/Shibboleth.sso/WAYF"/> <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://gallus.scilifelab.se/Shibboleth.sso/DS"/> <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://gallus.scilifelab.se/Shibboleth.sso/DS" index="2"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml index 8591afef..899fbfd5 100644 --- a/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml +++ b/swamid-1.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://graduateland.com/simplesaml/module.php/saml/sp/metadata.php/gl_gateway"> + <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/eu-adequate-protection</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/kurser.math.su.se-shibboleth.xml b/swamid-1.0/kurser.math.su.se-shibboleth.xml index a45974e4..39717c24 100644 --- a/swamid-1.0/kurser.math.su.se-shibboleth.xml +++ b/swamid-1.0/kurser.math.su.se-shibboleth.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurser.math.su.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/hei-service</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Kurssidor i matematik och matematisk statistik vid Stockholms universitet</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Course pages in mathematics and mathematical statistics at Stockholm University</mdui:DisplayName> diff --git a/swamid-1.0/mailfilter.nordu.net-shibboleth.xml b/swamid-1.0/mailfilter.nordu.net-shibboleth.xml index 81d84d18..e4a7170e 100644 --- a/swamid-1.0/mailfilter.nordu.net-shibboleth.xml +++ b/swamid-1.0/mailfilter.nordu.net-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter.nordu.net/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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="2"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/mailfilter.sunet.se-shibboleth.xml b/swamid-1.0/mailfilter.sunet.se-shibboleth.xml index f17d309e..ff9d9ece 100644 --- a/swamid-1.0/mailfilter.sunet.se-shibboleth.xml +++ b/swamid-1.0/mailfilter.sunet.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mailfilter.sunet.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/meetingtools.nordu.net-shibboleth.xml b/swamid-1.0/meetingtools.nordu.net-shibboleth.xml index ebd40a42..dbbbc42a 100644 --- a/swamid-1.0/meetingtools.nordu.net-shibboleth.xml +++ b/swamid-1.0/meetingtools.nordu.net-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meetingtools.nordu.net/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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meetingtools.nordu.net/Shibboleth.sso/DS/idp.nordu.net" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/meta.eduroam.se-shibboleth.xml b/swamid-1.0/meta.eduroam.se-shibboleth.xml index 231c1ce4..c1ad7c52 100644 --- a/swamid-1.0/meta.eduroam.se-shibboleth.xml +++ b/swamid-1.0/meta.eduroam.se-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.eduroam.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://meta.eduroam.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/nordunet.tv-shibboleth.xml b/swamid-1.0/nordunet.tv-shibboleth.xml index 3107c9bf..16021d1e 100644 --- a/swamid-1.0/nordunet.tv-shibboleth.xml +++ b/swamid-1.0/nordunet.tv-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nordunet.tv/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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nordunet.tv/Shibboleth.sso/Login" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml index 90fc3138..bd905ffa 100644 --- a/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml +++ b/swamid-1.0/nyainloggning.slu.se-shibboleth-sp.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nyainloggning.slu.se/shibboleth-sp"> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://nyainloggning.slu.se/Shibboleth.sso/DS" index="1"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.hig.se-shibboleth.xml b/swamid-1.0/play.hig.se-shibboleth.xml index f612b91b..27ca7f8b 100644 --- a/swamid-1.0/play.hig.se-shibboleth.xml +++ b/swamid-1.0/play.hig.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.hig.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://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://play.hig.se/Shibboleth.sso/DS/ds.sunet.se"/> <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://play.hig.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.liu.se-shibboleth.xml b/swamid-1.0/play.liu.se-shibboleth.xml index d530a1fc..e9d5fb58 100644 --- a/swamid-1.0/play.liu.se-shibboleth.xml +++ b/swamid-1.0/play.liu.se-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.liu.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.liu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.lu.se-shibboleth.xml b/swamid-1.0/play.lu.se-shibboleth.xml index 4433a3f1..4e442228 100644 --- a/swamid-1.0/play.lu.se-shibboleth.xml +++ b/swamid-1.0/play.lu.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.lu.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://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://play.lu.se/Shibboleth.sso/DS/ds.sunet.se"/> <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://play.lu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.mah.se-shibboleth.xml b/swamid-1.0/play.mah.se-shibboleth.xml index e97c8d70..56f2e63c 100644 --- a/swamid-1.0/play.mah.se-shibboleth.xml +++ b/swamid-1.0/play.mah.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mah.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://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://play.mah.se/Shibboleth.sso/DS/ds.sunet.se"/> <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://play.mah.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.mdh.se-shibboleth.xml b/swamid-1.0/play.mdh.se-shibboleth.xml index 0456b163..9028fbe8 100644 --- a/swamid-1.0/play.mdh.se-shibboleth.xml +++ b/swamid-1.0/play.mdh.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mdh.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://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://play.mdh.se/Shibboleth.sso/DS/ds.sunet.se"/> <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://play.mdh.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/play.sunet.se-shibboleth.xml b/swamid-1.0/play.sunet.se-shibboleth.xml index e061ab86..e8e303fd 100644 --- a/swamid-1.0/play.sunet.se-shibboleth.xml +++ b/swamid-1.0/play.sunet.se-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.sunet.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/registrera.hb.se-shibboleth.xml b/swamid-1.0/registrera.hb.se-shibboleth.xml index d95e079b..8e093258 100644 --- a/swamid-1.0/registrera.hb.se-shibboleth.xml +++ b/swamid-1.0/registrera.hb.se-shibboleth.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registrera.hb.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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>registrera.hb.se</ds:KeyName> diff --git a/swamid-1.0/shibboleth.ebscohost.com.xml b/swamid-1.0/shibboleth.ebscohost.com.xml index f95ec6a6..b0a85eed 100644 --- a/swamid-1.0/shibboleth.ebscohost.com.xml +++ b/swamid-1.0/shibboleth.ebscohost.com.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com"> + <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/eu-adequate-protection</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://shibboleth.ebscohost.com/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://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/sp.it.gu.se-shibboleth.xml b/swamid-1.0/sp.it.gu.se-shibboleth.xml index 4274a15b..09637b34 100644 --- a/swamid-1.0/sp.it.gu.se-shibboleth.xml +++ b/swamid-1.0/sp.it.gu.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.it.gu.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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.it.gu.se/Shibboleth.sso/DS" index="1"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/sp.swamid.se-shibboleth.xml b/swamid-1.0/sp.swamid.se-shibboleth.xml index f21bf577..6a5be909 100644 --- a/swamid-1.0/sp.swamid.se-shibboleth.xml +++ b/swamid-1.0/sp.swamid.se-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.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/sfs-1993-1153</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/> - <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/sfs-1993-1153</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName> <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName> diff --git a/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml b/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml index 591921dd..c34cb206 100644 --- a/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml +++ b/swamid-1.0/staging.dreamspark.com-shibboleth-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.dreamspark.com/shibboleth-sp"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </Extensions> <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </Extensions> <KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>staging.dreamspark.com</ds:KeyName> diff --git a/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index ad93f0f0..32399c44 100644 --- a/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-1.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index 5a4ff745..a985fc25 100644 --- a/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-1.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience.sunet.se/simplesamlphp/module.php/saml/sp/metadata.php/default-sp"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml index bff9bc59..30b0031b 100644 --- a/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-1.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal.sunet.se/simplesamlphp/module.php/saml/sp/metadata.php/default-sp"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/www.antagning.se-aws-sp.xml b/swamid-1.0/www.antagning.se-aws-sp.xml index 27260537..e2436e72 100644 --- a/swamid-1.0/www.antagning.se-aws-sp.xml +++ b/swamid-1.0/www.antagning.se-aws-sp.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.antagning.se/aws-sp"> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://www.antagning.se/Shibboleth.sso/Login"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/www.diva-portal.org-shibboleth.xml b/swamid-1.0/www.diva-portal.org-shibboleth.xml index d2e13686..581a1cd1 100644 --- a/swamid-1.0/www.diva-portal.org-shibboleth.xml +++ b/swamid-1.0/www.diva-portal.org-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.diva-portal.org/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/hei-service</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> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>www.diva-portal.org</ds:KeyName> diff --git a/swamid-1.0/www.play.umu.se-shibboleth.xml b/swamid-1.0/www.play.umu.se-shibboleth.xml index 0c30dc04..7f178bc0 100644 --- a/swamid-1.0/www.play.umu.se-shibboleth.xml +++ b/swamid-1.0/www.play.umu.se-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.play.umu.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://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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.play.umu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/> - <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://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml index 336a4074..6f23e667 100644 --- a/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml +++ b/swamid-1.0/www.universityadmissions.se-aws-sp-en.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.universityadmissions.se/aws-sp-en"> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://www.universityadmissions.se/Shibboleth.sso/Login"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/www3.genuinetext.com-shibboleth.xml b/swamid-1.0/www3.genuinetext.com-shibboleth.xml index dbe8ea9f..d8f5e1fe 100644 --- a/swamid-1.0/www3.genuinetext.com-shibboleth.xml +++ b/swamid-1.0/www3.genuinetext.com-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.genuinetext.com/shibboleth"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </Extensions> <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </Extensions> <KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-1.0/www4.genuinetext.com-shibboleth.xml b/swamid-1.0/www4.genuinetext.com-shibboleth.xml index a777024d..8f6d8288 100644 --- a/swamid-1.0/www4.genuinetext.com-shibboleth.xml +++ b/swamid-1.0/www4.genuinetext.com-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www4.genuinetext.com/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/eu-adequate-protection</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www4.genuinetext.com/Shibboleth.sso/DS" index="1"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml index b30314b9..952b04bc 100644 --- a/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml +++ b/swamid-1.0/xfire.mimas.ac.uk-shibboleth.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xfire.mimas.ac.uk/shibboleth"> + <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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </Extensions> <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </Extensions> <KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml index 087626ac..99b28e38 100644 --- a/swamid-2.0/aktivera.ki.se-shibboleth.xml +++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml @@ -19,17 +19,17 @@ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet</mdui:DisplayName> - <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description> - <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description> - </mdui:UIInfo> </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://aktivera.ki.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://aktivera.ki.se/Shibboleth.sso/Login" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet</mdui:DisplayName> + <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description> + <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description> + </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml index 36b100d3..77b2645e 100644 --- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml +++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml @@ -22,17 +22,17 @@ <mdui:Description xml:lang="sv">Bedömningshandboken utgör, vid sidan om Högskoleförordning och Högskoleverkets föreskrifter, underlaget för antagning till utbildning på grundnivå och avancerad nivå. Den utgör även grund för den överenskommelse som UHR har med universitet och högskolor som genomför sin antagning med stöd av det gemensamma antagningssystemet NyA.</mdui:Description> <mdui:InformationURL xml:lang="sv">https://bedomningshandboken.uhr.se/</mdui:InformationURL> </mdui:UIInfo> - <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://www.swamid.se/category/hei-service</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://bedomningshandboken.uhr.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://bedomningshandboken.uhr.se/Shibboleth.sso/Login" index="1"/> + <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://www.swamid.se/category/hei-service</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> 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 4959d61d..643da323 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 @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp"> + <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/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:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/> @@ -9,13 +18,6 @@ <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName> <mdui:Description xml:lang="en">NORDUnet Box Service Access</mdui:Description> </mdui:UIInfo> - <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/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:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> 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 1ce7e36c..39b5b74a 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 @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/metadata.php/default-sp"> + <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/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:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/> @@ -9,13 +18,6 @@ <mdui:DisplayName xml:lang="en">SUNET Box Service Access</mdui:DisplayName> <mdui:Description xml:lang="en">SUNET Box Service Access</mdui:Description> </mdui:UIInfo> - <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/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:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/box.net.xml b/swamid-2.0/box.net.xml index 89a06d3b..40394cd2 100644 --- a/swamid-2.0/box.net.xml +++ b/swamid-2.0/box.net.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="box.net"> + <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/eu-adequate-protection</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> - <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/eu-adequate-protection</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml index b101a028..8202195c 100644 --- a/swamid-2.0/connect.funet.fi-shibboleth.xml +++ b/swamid-2.0/connect.funet.fi-shibboleth.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.funet.fi/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/eu-adequate-protection</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.funet.fi/Shibboleth.sso/DS/haka.funet.fi" index="2"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml index db81f977..a8a6a939 100644 --- a/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml +++ b/swamid-2.0/crowd-test.it.su.se-shibboleth.sso.xml @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd-test.it.su.se/Shibboleth.sso"> + <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/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/> @@ -10,12 +18,6 @@ <mdui:DisplayName xml:lang="en">Test implementation of Crowd at Stockholm University</mdui:DisplayName> <mdui:Description xml:lang="sv">This service allows users to access the test implantation of Crowd at Stockholm University.</mdui:Description> </mdui:UIInfo> - <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://www.swamid.se/category/hei-service</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/kilw.ki.se-shibboleth.xml b/swamid-2.0/kilw.ki.se-shibboleth.xml index c027420c..d976f71a 100644 --- a/swamid-2.0/kilw.ki.se-shibboleth.xml +++ b/swamid-2.0/kilw.ki.se-shibboleth.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kilw.ki.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/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://kilw.ki.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://kilw.ki.se/Shibboleth.sso/Login" index="1"/> <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://kilw.ki.se/Shibboleth.sso/Login" index="2"/> <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://kilw.ki.se/Shibboleth.sso/Login" index="3"/> - <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://www.swamid.se/category/hei-service</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Karolinska Institutet LW-proxy</mdui:DisplayName> <mdui:Description xml:lang="sv">Proxy mot Ladoks uppföljningstjänster</mdui:Description> 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 7411179e..817184b3 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 @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://medlem.studentkareniboras.se/saml/simplesamlwww/module.php/saml/sp/metadata.php/AgeraMedlem"> + <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/hei-service</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Medlemsportalen</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Member Portal</mdui:DisplayName> diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml index 16425ab8..67dcf85b 100644 --- a/swamid-2.0/selfservice.hb.se-shibboleth.xml +++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml @@ -21,6 +21,13 @@ and do *NOT* provide it in real time to your partners. <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> + <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/hei-service</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> @@ -29,13 +36,6 @@ and do *NOT* provide it in real time to your partners. <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://selfservice.hb.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> <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://selfservice.hb.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://selfservice.hb.se/Shibboleth.sso/Login" index="2"/> - <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/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">SelfService - Högskolan i Borås</mdui:DisplayName> <mdui:DisplayName xml:lang="en">SelfService - University of Borås</mdui:DisplayName> diff --git a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml index 6f027e50..38ae9b4f 100644 --- a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml +++ b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitin.com/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/eu-adequate-protection</samla:AttributeValue> + <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </md:Extensions> <md:SPSSODescriptor AuthnRequestsSigned="1" 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://shibboleth.turnitin.com/Shibboleth.sso/Login"/> @@ -14,12 +22,6 @@ <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://shibboleth.turnitin.com/Shibboleth.sso/WAYF/DFNAAITEST" index="5"/> <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://shibboleth.turnitin.com/Shibboleth.sso/WAYF/SWAMID"/> <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://shibboleth.turnitin.com/Shibboleth.sso/WAYF/SWAMID" index="6"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">Turnitin</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Turnitin</mdui:DisplayName> diff --git a/swamid-2.0/shibdev.rsc.org-shibboleth.xml b/swamid-2.0/shibdev.rsc.org-shibboleth.xml index 43362518..8f19deda 100644 --- a/swamid-2.0/shibdev.rsc.org-shibboleth.xml +++ b/swamid-2.0/shibdev.rsc.org-shibboleth.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev.rsc.org/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/eu-adequate-protection</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://shibdev.rsc.org/Shibboleth.sso/Login"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/ugit.se-sp.xml b/swamid-2.0/ugit.se-sp.xml index b9281661..4146e2f6 100644 --- a/swamid-2.0/ugit.se-sp.xml +++ b/swamid-2.0/ugit.se-sp.xml @@ -7,17 +7,19 @@ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="en">UGIT</mdui:DisplayName> - <mdui:Description xml:lang="en">Free collaborative revision control service for Swedish university students</mdui:Description> - <mdui:InformationURL xml:lang="en">https://ugit.se</mdui:InformationURL> - <mdui:Logo width="128" height="32">https://ugit.se/sp/images/ugit.png</mdui:Logo> - </mdui:UIInfo> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha256"/> <alg:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="en">UGIT</mdui:DisplayName> + <mdui:Description xml:lang="en">Free collaborative revision control service for Swedish university students</mdui:Description> + <mdui:InformationURL xml:lang="en">https://ugit.se</mdui:InformationURL> + <mdui:Logo width="128" height="32">https://ugit.se/sp/images/ugit.png</mdui:Logo> + </mdui:UIInfo> + </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>ugit.se</ds:KeyName> diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml index 437ea096..466fd2b3 100644 --- a/swamid-2.0/urn-urkund-shibboleth-sp.xml +++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:urkund:shibboleth:sp"> + <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/eu-adequate-protection</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> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.urkund.com/Shibboleth.sso/DS" index="1"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> 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 c5de4138..0f4b53bd 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 @@ -16,10 +16,6 @@ and do *NOT* provide it in real time to your partners. <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Stage-miljö för Ladok3 MIT</mdui:DisplayName> - <mdui:Description xml:lang="sv">Stage-miljö inför deployer av Ladok3 i MIT-miljön på ITS, Umeå universitet</mdui:Description> - </mdui:UIInfo> <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> @@ -31,6 +27,10 @@ and do *NOT* provide it in real time to your partners. <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://www-stage.ladok3.its.umu.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://www-stage.ladok3.its.umu.se/Shibboleth.sso/Login" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Stage-miljö för Ladok3 MIT</mdui:DisplayName> + <mdui:Description xml:lang="sv">Stage-miljö inför deployer av Ladok3 i MIT-miljön på ITS, Umeå universitet</mdui:Description> + </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> 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 699c4843..c586dc55 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 @@ -12,10 +12,6 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Stage-miljö för Ladok3 MIT</mdui:DisplayName> - <mdui:Description xml:lang="sv">Stage-miljö inför deployer av Ladok3 i MIT-miljön på ITS, Umeå universitet</mdui:Description> - </mdui:UIInfo> <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> @@ -27,6 +23,10 @@ <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://www-utb.ladok3.its.umu.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://www-utb.ladok3.its.umu.se/Shibboleth.sso/Login" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Stage-miljö för Ladok3 MIT</mdui:DisplayName> + <mdui:Description xml:lang="sv">Stage-miljö inför deployer av Ladok3 i MIT-miljön på ITS, Umeå universitet</mdui:Description> + </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-2.0/www.ifmsa.se-sp.xml b/swamid-2.0/www.ifmsa.se-sp.xml index bdfc51b1..0c010a42 100644 --- a/swamid-2.0/www.ifmsa.se-sp.xml +++ b/swamid-2.0/www.ifmsa.se-sp.xml @@ -1,15 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ifmsa.se/sp"> + <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/eu-adequate-protection</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://www.ifmsa.se/Shibboleth.sso/DS/ds.swamid.se"/> <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://www.ifmsa.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> - <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/eu-adequate-protection</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> 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 5d95ce49..5d051e60 100644 --- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml +++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml @@ -12,11 +12,6 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> - <mdui:DisplayName xml:lang="sv">Ladok3 MIT</mdui:DisplayName> - <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description> - <mdui:InformationURL xml:lang="sv">https://confluence.its.umu.se/confluence/pages/viewpage.action?pageId=5310677</mdui:InformationURL> - </mdui:UIInfo> <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> @@ -28,6 +23,11 @@ <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://www.mit.ladok.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://www.mit.ladok.se/Shibboleth.sso/Login" index="1"/> + <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="sv">Ladok3 MIT</mdui:DisplayName> + <mdui:Description xml:lang="sv">Ladok3-projektets Migrations-, Integrations- och Testmiljö (MIT-miljön)</mdui:Description> + <mdui:InformationURL xml:lang="sv">https://confluence.its.umu.se/confluence/pages/viewpage.action?pageId=5310677</mdui:InformationURL> + </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml index 2c6da6d3..dd224d76 100644 --- a/swamid-interfederations-2.0/box-idp.nordu.net.xml +++ b/swamid-interfederations-2.0/box-idp.nordu.net.xml @@ -4,6 +4,13 @@ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/"> <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> + <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> + <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <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:Attribute> + </mdattr:EntityAttributes> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> @@ -14,13 +21,6 @@ <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName> <mdui:Description xml:lang="en">NORDUnet Box Service Access</mdui:Description> </mdui:UIInfo> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <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:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-interfederations-2.0/connect.sunet.se.xml b/swamid-interfederations-2.0/connect.sunet.se.xml index 93184cc4..f8d93dd5 100644 --- a/swamid-interfederations-2.0/connect.sunet.se.xml +++ b/swamid-interfederations-2.0/connect.sunet.se.xml @@ -4,6 +4,12 @@ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/"> <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> + <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> + <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> + <samla:AttributeValue>http://www.swamid.se/category/nren-service</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> @@ -11,12 +17,6 @@ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/nordu.net" index="3"/> <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/> - <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> - <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> diff --git a/swamid-interfederations-2.0/sp.swamid.se.xml b/swamid-interfederations-2.0/sp.swamid.se.xml index 98c7caf0..5f49a2e7 100644 --- a/swamid-interfederations-2.0/sp.swamid.se.xml +++ b/swamid-interfederations-2.0/sp.swamid.se.xml @@ -4,17 +4,17 @@ <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/"> <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> - </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> - <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> - <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/> <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <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: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> + <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/> + <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName> <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName> |