diff options
-rw-r--r-- | swamid-2.0/brandkeeper.se-wsfed.xml | 11 | ||||
-rw-r--r-- | swamid-2.0/idp.ths.se-idp-shibboleth.xml | 14 | ||||
-rw-r--r-- | swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml | 36 | ||||
-rw-r--r-- | swamid-2.0/slltest2.luvit.se-shibboleth.xml | 10 |
4 files changed, 41 insertions, 30 deletions
diff --git a/swamid-2.0/brandkeeper.se-wsfed.xml b/swamid-2.0/brandkeeper.se-wsfed.xml index d054d3dd..6e8044ae 100644 --- a/swamid-2.0/brandkeeper.se-wsfed.xml +++ b/swamid-2.0/brandkeeper.se-wsfed.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" entityID="https://brandkeeper.se/wsfed"> + <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> + </samla:Attribute> + </mdattr:EntityAttributes> + </Extensions> <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <Extensions> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> @@ -9,6 +16,8 @@ <mdui:Description xml:lang="en">BrandKeeper is a web based system for creation of marketing materials (brochures, folders etc.) and stationery (business card, correspondence cards etc.) to high resolution files ready for print. The service also includes a MediaBank (Digital library).</mdui:Description> <mdui:InformationURL xml:lang="sv">http://www.brandkeeper.se</mdui:InformationURL> <mdui:Logo height="61" width="350">https://www.incited.se/brandkeeper-logo-350.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="en">https://www.incited.se/InSys/v2/Public/PrivacyStatement</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://www.incited.se/InSys/v2/Public/PrivacyStatement/Sv</mdui:PrivacyStatementURL> </mdui:UIInfo> </Extensions> <KeyDescriptor> @@ -23,7 +32,7 @@ <ServiceName xml:lang="en">SP</ServiceName> <RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/> <RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/> - <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="false" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/> + <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/> </AttributeConsumingService> </SPSSODescriptor> <Organization> diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml index 6dc0b26f..c89994b4 100644 --- a/swamid-2.0/idp.ths.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml @@ -5,11 +5,11 @@ <shibmd:Scope regexp="false">ths.se</shibmd:Scope> <shibmd:Scope regexp="false">ehs.se</shibmd:Scope> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName> - <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description> - <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description> - <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo> + <mdui:DisplayName xml:lang="sv">Enskilda Högskolan Stockholm</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">University College Stockholm</mdui:DisplayName> + <mdui:Description xml:lang="sv">Identity Provider för Enskilda högskolan Stockholm</mdui:Description> + <mdui:Description xml:lang="en">Identity Provider for University College Stockholm</mdui:Description> + <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ehs_100x100.png</mdui:Logo> </mdui:UIInfo> </Extensions> <KeyDescriptor use="signing"> @@ -179,8 +179,8 @@ xAdB19mh1plahNrAaEfu6Ldetyz9iulY </AttributeAuthorityDescriptor> <Organization> <OrganizationName xml:lang="en">THS</OrganizationName> - <OrganizationDisplayName xml:lang="sv">Teologiska högskolan Stockholm</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">Stockholm School of Theology</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="sv">Enskilda Högskolan Stockholm</OrganizationDisplayName> + <OrganizationDisplayName xml:lang="en">University College Stockholm</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.ths.se/english</OrganizationURL> <OrganizationURL xml:lang="sv">http://www.ths.se</OrganizationURL> </Organization> diff --git a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml index d5522269..643d7782 100644 --- a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml +++ b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml @@ -18,7 +18,7 @@ <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: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> @@ -28,8 +28,8 @@ <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://moodlebeta.omv.lu.se/Shibboleth.sso/Login"/> <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DisplayName xml:lang="en">moodlebeta.omv.lu.se</mdui:DisplayName> <mdui:DisplayName xml:lang="sv">moodlebeta.omv.lu.se</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">moodlebeta.omv.lu.se </mdui:DisplayName> <mdui:Description xml:lang="sv">Testplattform för moodle med "shibbad" autentisering</mdui:Description> <mdui:Description xml:lang="en">Test moodle system with shibboleth authentication</mdui:Description> </mdui:UIInfo> @@ -40,23 +40,23 @@ <ds:KeyName>moodlebeta.omv.lu.se</ds:KeyName> <ds:X509Data> <ds:X509SubjectName>CN=moodlebeta.omv.lu.se</ds:X509SubjectName> - <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMePkgfbFsJkMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV -BAMTFG1vb2RsZWJldGEub212Lmx1LnNlMB4XDTE3MDMxMDE0MDgzM1oXDTI3MDMw -ODE0MDgzM1owHzEdMBsGA1UEAxMUbW9vZGxlYmV0YS5vbXYubHUuc2UwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC96jPhgGPjR7tkOi2MNwsBfNp+bv6A -jcMYl1rAtYvy8XkV5tpxqjZUuag5SwdfN3ocawzJ7wfz3637K57YiKHMcsq137Kk -UyJFnHpE36QN8XfL3FjsExSdQj25Nl30F3UnlyHE0FuvZY/gHag/IrckTrvVKAbx -ePtN10voFVWjs3KqHNLKoQtiZT+xtou3jzuYiZuKAwjYsZ9SaZM/Y1OurDo8p0Ai -n3W9BlCBfPgicCF5WSccTIClnsf2sLSzEnjbyUvrshmqdWvH+RYiGAfOrwIKeB3M -9ReY2N7mIEb9XGg5kvlWEKgORUuBnB9zPqYdWBvNWeEnOY3QX/XWr8mDAgMBAAGj + <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAMbPcmszD/lGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV +BAMTFG1vb2RsZWJldGEub212Lmx1LnNlMB4XDTE4MTIwNTEyMjczNVoXDTI4MTIw +MjEyMjczNVowHzEdMBsGA1UEAxMUbW9vZGxlYmV0YS5vbXYubHUuc2UwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEWYUNIyHNg8dQu28U6xmMbA9nJGdQ +4SWdHeW2zfu22ZuKKIvZ8dyBaIXDTyaqi5I11aB5K+RVBvtxJAms/q2YHdUNELGL +8mGiVKWUXFo5VPbj+bLjzoeN4Ovf+cHgqJn+nhUSGOP00FFxlcUFtEHtEUpu5J3B +d3/ByA4+K8ViWXCabC5kff4su2NzCRrNx16EYawYZpT/o42zW5mmpElWbsdFx4/B +fsqWzkOFKy1EzLIya+Rf0FK+wyJ39YoeaVB+nyQp7ayl/ps36z7sZ7n9EbAa4chG +buPYC92NKS0+tWu79yTpfMgfUxMq3OSDOo2ir1Z/BVh++yZLIc4bUxGnAgMBAAGj azBpMEgGA1UdEQRBMD+CFG1vb2RsZWJldGEub212Lmx1LnNlhidodHRwczovL21v -b2RsZWJldGEub212Lmx1LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFGjAFHQTjOuJ -BLngaZ7Ub7dAkdNmMA0GCSqGSIb3DQEBBQUAA4IBAQCBUTUgSW0KiWeUvAxBFD0U -5vh7ONsWLALt/A2DaPjBnt8mSwpNTxVDOsG6xRsWd3PBAlAMdRegBa+AVnHZ73bB -t0K2KG+0wWAxoN1CzVZkpHSseJo7gvqyr4hPbvjjEBgzfy+uLKrsFugSJ2prDoz1 -UlS5oga5aSGbGsx+m0a/r1fHFxP7Bl1v6zVWmFqk6FWXQ9Hk4nHCYDOr70NXvots -Sn478pAA2nM4qcMSUl0m2Fk9GAWUwwpnXdB6p52xLg8Xk6U89xTBG/o1QWAqya8J -qfYd+5n3MyDjz52nTvvpNGwQ6Hp2Y0HBNaR6L1ia/WX84LcneVyDvCwDUESMPWT1 +b2RsZWJldGEub212Lmx1LnNlL3NoaWJib2xldGgwHQYDVR0OBBYEFNqHjCxT+XUB +cXIHD+2aouOeLzSLMA0GCSqGSIb3DQEBBQUAA4IBAQAevQ1B3ZBJxggZb78p/rw9 +QyPpxXd9zrFeCsK7+nhxNJRs1WlxZCpbk/ZM3T4xZJIYycd2e4URMJHVTJSpYW2g +Kpe9258XWrKZlCG021SchSFmx/T278T+Il1BkPjzWHA+Bb95fM+9H+rbsitNXgLm +out7XeSBGh8AgXgAJepbW4kC6He+QDeGcnkXZCGxBCXjED1RPKyGGwYDWciocFr/ +QZpfRafdJ5Dwj2DtqwpISY8WJHyWQUBFe28W1+95WuMwGNhgKyq/FCczsOpgjh+K +jzMxgqnyamTpp7hwx3jDcTUb+je1noS8/idhg2ftGINQzJmTufH/xF02Yz6qwDkw </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> diff --git a/swamid-2.0/slltest2.luvit.se-shibboleth.xml b/swamid-2.0/slltest2.luvit.se-shibboleth.xml index 711d250e..5a6b28e5 100644 --- a/swamid-2.0/slltest2.luvit.se-shibboleth.xml +++ b/swamid-2.0/slltest2.luvit.se-shibboleth.xml @@ -1,8 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- -This is example metadata only. Do *NOT* supply it as is without review, -and do *NOT* provide it in real time to your partners. - --> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slltest2.luvit.se/shibboleth"> <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> @@ -21,6 +17,12 @@ 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/research-and-education</samla:AttributeValue> + <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:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> |