diff options
| -rw-r--r-- | swamid-2.0/blender.c3se.chalmers.se-a.xml | 25 | ||||
| -rw-r--r-- | swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml | 11 |
2 files changed, 32 insertions, 4 deletions
diff --git a/swamid-2.0/blender.c3se.chalmers.se-a.xml b/swamid-2.0/blender.c3se.chalmers.se-a.xml index 42a1d173..82b87ea6 100644 --- a/swamid-2.0/blender.c3se.chalmers.se-a.xml +++ b/swamid-2.0/blender.c3se.chalmers.se-a.xml @@ -17,8 +17,7 @@ <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://refeds.org/category/research-and-scholarship</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> @@ -31,6 +30,8 @@ <mdui:DisplayName xml:lang="en">SUPR test server Blender</mdui:DisplayName> <mdui:Description xml:lang="sv">Testserver (Blender) för SNIC User and Project Repository (SUPR).</mdui:Description> <mdui:Description xml:lang="en">Test server (Blender) for the SNIC User and Project Repository (SUPR).</mdui:Description> + <mdui:InformationURL xml:lang="sv">https://supr.snic.se/</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">https://supr.snic.se/</mdui:InformationURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> @@ -79,4 +80,24 @@ wtfo4cuUZJ2I0K9K0VcFYQ== <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">SNIC</md:OrganizationName> + <md:OrganizationName xml:lang="sv">SNIC</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">Swedish National Infrastructure for Computing</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Swedish National Infrastructure for Computing</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">https://snic.se/</md:OrganizationURL> + <md:OrganizationURL xml:lang="sv">https://snic.se/</md:OrganizationURL> + </md:Organization> + <md:ContactPerson contactType="support"> + <md:SurName>Support SUPR</md:SurName> + <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="administrative"> + <md:SurName>Support SUPR</md:SurName> + <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="technical"> + <md:SurName>Support SUPR</md:SurName> + <md:EmailAddress>mailto:support@supr.snic.se</md:EmailAddress> + </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml b/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml index c2fce378..c8e8e25c 100644 --- a/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml +++ b/swamid-2.0/drive.test.sunet.se-index.php-apps-user_saml-saml-metadata.xml @@ -10,7 +10,7 @@ </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> - <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <mdui:UIInfo> <mdui:DisplayName xml:lang="en">SUNET Drive (test)</mdui:DisplayName> @@ -28,7 +28,14 @@ </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> - <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat> + <md:KeyDescriptor use="encryption"> + <ds:KeyInfo> + <ds:X509Data> + <ds:X509Certificate>MIID8zCCAtugAwIBAgIUKTUl48fwGETx9iOlCOl6MNAk7agwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMB4XDTIxMDkwOTEzMDkwOVoXDTIxMTAwOTEzMDkwOVowgYgxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFTdG9ja2hvbG1zIGzDg8KkbjESMBAGA1UEBwwJU3RvY2tob2xtMQ4wDAYDVQQKDAVTdW5ldDEcMBoGA1UEAwwTZHJpdmUudGVzdC5zdW5ldC5zZTEbMBkGCSqGSIb3DQEJARYMbm9jQHN1bmV0LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuih5NHhEW+w7fMMyc75QIuzOvbGgfW7sAYC2hSs8cnsM+xa+2l+y8AgmGz3axxExJEJcMU3eDEVbrVGSUquuG/ryZqEM37yvS1man8TuA/ZG2rAekwkgSKDEM6HnWKJxOU1dTrh2PHjCq54hHni9Km3Bqmnb2V31XyipIU915GBMKnIvonD+ZmVG8e36KJ6/Knx5Sx7Wi4AxtilgNuau3ozCuYGDVqUaXKGR9PtJ9c0+wdNI4Rp9S3QLm+49W36hqffHKsvSggEUFK2fWB6TQJLrXKdq3GYAAfxkQJfUybty+gJt2eNi6+lmM8Yl+BbdSrnf1Wx65gYLFwFPSMN4QIDAQABo1MwUTAdBgNVHQ4EFgQUk4fWG3RRNLcpxATRxIVSvl0jnxEwHwYDVR0jBBgwFoAUk4fWG3RRNLcpxATRxIVSvl0jnxEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAavY02JoYbR8sHbC4T+DvC7quVsDtFUsNkQesLPrCRSB1dfaIxd9ImsevFwkq9+x+9YXVPqF+RJgApneuDgZYGh5VREDwH8+UxkwOh8FQlt3JZXoEGzwZVYAQ79p33b4TQx2qayfAnyn4PTzpL21zq848AUaOS0yJyq9PY6jOoCaAJdTeQNIZ8DIWgU2i0mCwyQtDbW0gfuOim8sG6go8SZGAU6E2QgmvzVR94Bur91rri0CkImvhsVRhiA8JloeEmqBMbJyOobjkBopQ5c0qyARjVP9gxdB3aZnhB6DI59RchN1BztjwG9FuIOcD8sVJOpUMUXseN0xyPQQ0sD4WyA==</ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + </md:KeyDescriptor> + <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.test.sunet.se/index.php/apps/user_saml/saml/acs" index="1"/> </md:SPSSODescriptor> <md:Organization> |