summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Mattsson <bjorn@sunet.se>2022-06-22 10:54:31 +0200
committerBjörn Mattsson <bjorn@sunet.se>2022-06-22 10:54:31 +0200
commit9adccaec516912e95f60ad0253bb55ac5542a824 (patch)
tree12c1a7f958522fabbce5822bc938e5ba912ee678
parentd2d8141d1401724299e66f45c6e4adb960373e11 (diff)
SWAMID-1103 SWAMID-1104 SWAMID-1105 Updated https://visp-demo.humlab.umu.se https://visp.humlab.umu.se https://datalab.humlab.umu.se
-rw-r--r--swamid-2.0/datalab.humlab.umu.se.xml28
-rw-r--r--swamid-2.0/visp-demo.humlab.umu.se.xml16
-rw-r--r--swamid-2.0/visp.humlab.umu.se.xml11
3 files changed, 45 insertions, 10 deletions
diff --git a/swamid-2.0/datalab.humlab.umu.se.xml b/swamid-2.0/datalab.humlab.umu.se.xml
index c01e327f..32ee3177 100644
--- a/swamid-2.0/datalab.humlab.umu.se.xml
+++ b/swamid-2.0/datalab.humlab.umu.se.xml
@@ -5,7 +5,7 @@
<mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</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" 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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
<samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
@@ -13,34 +13,40 @@
<md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo>
- <mdui:DisplayName xml:lang="sv">Humlabs DataLab</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">Humlabs DataLab</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Datalab</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Datalab</mdui:DisplayName>
<mdui:Description xml:lang="sv">Humlabs infrastruktur för ett online versionshanterat forskningsflöde</mdui:Description>
<mdui:Description xml:lang="en">Humlab infrastructure for an online version controlled research flow</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://datalab.humlab.umu.se/om</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://datalab.humlab.umu.se/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo>
- <ds:KeyName>e6op9xwrTDRZYQu_2tv_8llts0GkiY344Sxm-s-jbGk</ds:KeyName>
+ <ds:KeyName>9SZOgZXbE_q00_cb7iDo8fJXB098qK1TzMzoFDIvt5Y</ds:KeyName>
<ds:X509Data>
- <ds:X509Certificate>MIICnTCCAYUCBgF46ckwkjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdkYXRhbGFiMB4XDTIxMDQxOTEwNTc1OVoXDTMxMDQxOTEwNTkzOVowEjEQMA4GA1UEAwwHZGF0YWxhYjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOmdz1Dp3h7kkx466UWy0+86arQm1eKrMMD24JVoHZ3lpvfN5HAa7w6UyhGCZVeoBwHmGPtz9fZyKpAKQjo8FF7KALOI5ij9xKlWW5ShEGNSWPEGypMxr+05nfgpjqMTelYta2ZONpj4TT/k0PH/D6F5TfXHWPVVmkd1r3golgPCYtsLecP7FwAz0dwMIrC2AOEJ7seo9Phxz1X/SKBFqdJqLt/1LXT7xf6qAiBFySvzS7YLvkZ8rRYEg5W60yfEhMOAPCk+rYardcUXADgpXlxLmOT0V2AvN0shDMAiDHZKLDA++gILTqRco0BWvjhJn14BJ2hyG/pM8BO5eIQB+9cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQ1klt1FaClZVJ16p8QzIVH2GMhCTPRkEf5SX+wxztRQnix7r17ce69EQWzCfC9HGOOX0/7GjDrlVvC+iTq2WPCBxKR6xKo/d938BLXO46QWwnrTn4xHuo/eZcqn+HtbH2KET6RE8pXlBsf95JNCNVfl8Xfs+u9DoA5yPaKYkhhpBiPoYYsYaEC8tsVj6nbZpJmRmeL3t6Vw8D7FDXXisl4Jn7zeZAYv0fBlGwS1Y6Gs5FfD9ulj6sxALsV27ZyP7njupHY9CU4llRtV+hHlnjDe1DBj+mo6gLvP3yxV8x1bEDRURLqBb6dJmG8KUKFIAzO/5vJv/fuzE5xxY6yWSBg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIElzCCAn8CBgGBhpIJSDANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR2aXNwMB4XDTIyMDYyMTE0MDAyNloXDTMyMDYyMTE0MDIwNlowDzENMAsGA1UEAwwEdmlzcDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALCa6g4l8kqzgeRmu2rpNAGXLTdItelAFXRztyGk7mCaeY+rOuY8bNrVaaHiezLElkNLKFJEtL54zMCFHEm5cAGYwWpbdblHvOcvIRIQ/VG6/jlQXxu+MC1tTB/fBwBtBvkF0DURXnwMTE82LtatQq2rDR+o54Md/j0Rn47X3TgGYUhlvfUljw8LeVS/IHuAZwmH5luyBAyx/vdaqnQfwssvuLl3vNUp9Wbndt6Y81XPGIOW/+W83dxVlkWFpX31ERQb4MNdA9z1qR9ROhrhntfP8spT2o+8HdVwyzhDK4flhLLe8BWuNQIqLInHyQJfk4wUG+x6vos/bgUaGyuZKaONASFpWvLo8EtQ2gD/lwSHr8s+6NW97Tnm65tQVix4VS8xwgx3dAVAWNRQZHhDr3rrng9BPtEmz3v7ZzWTtamMOdigE7nps+JUd9b49utcVcD02OuDuI99rE1h7XgLIPsyiRSBsjzMy3POj/pL+7hkPI8fSGdUvHV5ah+FA01h/jADvCOoJmYnFesdPItEzjQVaGi+qKyEz1vTLopK3cY4OINwcWpscuwXD7DiTC1QwEkpYjU1T2gNAY+BzKn//j8cLH8eZj5GytDmbSeyTo5kNRSK2OU72k2MeI1ZCnk2Va0fN8RFQMoJgpRA1qm0jQQN3Q8jGm5KkCi13yKGIKs1AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAFGKr8AMappubz03tjeBX+z4myD2NF1/e9AnHhtCjz63evR1hO3BwtCdU6RNoNsqgmsi1GSRzTW7VwyRRqy9pZ5NkKMkUvjM81w3woUdLNV1ZcMJdrS9Ba9zpqaCgOnIq+V2kmXrTNkUASzs893pEeaZ/RL5npG8dltrGp9vzVlsZjQdUvVXWLcUCxVhBWtQ/teh+7MOQyhy2aXsb+i/quM91MXtkxUvHeOfFSvm6HlnAZihKFY16UnkfyjcHTqTdmx/MdyBaDRvfouQempOscOQFL41RbBn9GHSRRK+GIaah4tKdE/bd8FVcV5JtDaE2cjafwbHTbcAt6q6QkozspFceUP26HVOSPR6BuwvcnwZtKsDpHPnC0/QAu3RUv08QtBne+KnOrLZxOMejEprrtU1+FWk/yGQ7RmSwkb5btn5I6znTeNsC/ewu9Uf2FU2BcjMXKiym2c9LlsyhMyT6NKH4KBeDaiYg+3LfPL00OM764OzjDWmWLdl4bSSwhGfcUl5Ql6/zIbccEMCzSwEL3FfJP9zfC7GBaJ+35gxME8TkwOGEMQxWNX1c4ydzkYTqj7gZCuZZ4+AK0k0kHLM8f+GgeHI/T3D05Woy9HOkW4EfNb2g//c1AjzseO72WlfX3QrS4XX997nPt1hSYqoq6fxUwsqQGKCP2sMUQ/pwlg8</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.datalab.humlab.umu.se/auth/realms/datalab/broker/Umu-id/endpoint"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.datalab.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint"/>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.datalab.humlab.umu.se/auth/realms/datalab/broker/Umu-id/endpoint" isDefault="true" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.datalab.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint" index="1" isDefault="true"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="en">Required attributes</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Obligatoriska attribut</md:ServiceName>
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:Organization>
<md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
+ <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
<md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
<md:OrganizationURL xml:lang="en">https://umu.se</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://umu.se</md:OrganizationURL>
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Johan von Boer</md:GivenName>
@@ -50,4 +56,12 @@
<md:GivenName>Humlab Support</md:GivenName>
<md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Humlab Support</md:GivenName>
+ <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>UmU Incident Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/visp-demo.humlab.umu.se.xml b/swamid-2.0/visp-demo.humlab.umu.se.xml
index 06bf0ed5..16c1c782 100644
--- a/swamid-2.0/visp-demo.humlab.umu.se.xml
+++ b/swamid-2.0/visp-demo.humlab.umu.se.xml
@@ -16,16 +16,18 @@
<mdui:DisplayName xml:lang="sv">Visual Speech</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Visual Speech</mdui:DisplayName>
<mdui:Description xml:lang="sv">Humlabs infrastruktur för ett online forskningsflöde gällande taldata</mdui:Description>
- <mdui:Description xml:lang="en">Humlab infrastructure for an online research flow regarding speech data</mdui:Description>
+ <mdui:Description xml:lang="en">Humlab infrastructure for an online research flow in regards to speech data</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://visp-demo.humlab.umu.se/om</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://visp-demo.humlab.umu.se/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo>
- <ds:KeyName>eRjMPMbZ7INWJBQT2fOPoPjUhuhls0wHxeW7nf_AQpg</ds:KeyName>
+ <ds:KeyName>2T7VWmh2Y47GE8XQi_RlpXclgIMCr_uUbnvWG1Jd7cs</ds:KeyName>
<ds:X509Data>
- <ds:X509Certificate>MIIClzCCAX8CBgF7pthCDjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR2aXNwMB4XDTIxMDkwMjE0MDgxNVoXDTMxMDkwMjE0MDk1NVowDzENMAsGA1UEAwwEdmlzcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4XhHrxXyqEyKsClQgOvGBt7TPxtZIdBWpcCPehNxGL+G+p3QrmE39CWv18ek8NEv5jxRuxHt/bLShI3PDfXlN2qVp9aw3rplWCgHKQu5QbpJycE8+clT8pAtFs4wZzq1SFJjoXy+HkgsM58skkPHT6P9nWL3W8Q5+0M3KD24nLT7o5dVq5ygjXcMSWkXKHOGix1PMMMMQHpCaLzrPRx7+H6zSYZC/wz1kXpEi6PZrjvIbIjDHXTF8T4QhLqExA+SRC59I+XVNkJyAjP5izjea7UcWGeRSL7qBLq/4bL1nJacXHfLrIsa16vEcEl0Zplka+Xxk5UcQtqzyN6A5jAWECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAWaNTSVzuSvKM+pkgUmZG4F3rAS7aCDPh5uGQg9TaGhi22ENmVDxMdIC37V6a0uiJwTWQt1Z6Bne5CkEU0oEHnpN4CuSGGIOm66gxseOOskqgnm6b+sES4WINRxFR+5rFozgdgnVRN7QeZ4IhgR+kvrEdtG2w3igfx6bQatQzDe8hFsmfijGYcLo7BaBd8I6YA4pctJlmWdk7Q5N1NUm9jC1lto6dgaYSfG5++fzX+fW6oVWIl7TsHNJhwe9/GTHZhbzVVWgea+73bunBBnBbylHHJ2WGOIgKv+s6ggX7RfkG/aI1icZMF3i6fvkJNz0Mde0pcxBgO+ArJCsDI1f0TA==</ds:X509Certificate>
+ <ds:X509Certificate>MIIElzCCAn8CBgF5iZbj7TANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR2aXNwMB4XDTIxMDUyMDExNDIxN1oXDTMxMDUyMDExNDM1N1owDzENMAsGA1UEAwwEdmlzcDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJXmCrgRn/oFlK5cc4GXIktviAohU3REKmgoMCwIt90iH0b7y7LVQHn+18cVCN5uzpB6wDYQ8kjKWvn3VMH6Ytep4pdUoPbntJH6cqU5hSVY/AQ98u98FwfK8glHPTR8lRikcD2hfFsmwfHwAMVpiYBbYE15YnZpVZpaEI98cP6bEy4iJ4ya+LkKbrXZZUHtoOD4QXGeIfGGMlnBZ9Vc4DvtQbRdpunIeg02T0WcNrJ6l463DPn+qbzo1u/e8MrnXvLEw8z7rAH9/BzrgOWfedwgYkSdwMsFyRvDP+XAaOxdglQmlb9jiHf/vNUN6fPOFhtASyfpq1gyZpdjBFWztm1O1adHdx2wpCW++pnsslBD3a45/ovI5djQQcJtu+syTaZl+ewAE6l8v27F25LvfE0N4s9z3E4XS+PGapzR3RKD/WGSIb1UnihG09WpnFVFmAXwiPiP9nxQ3XOrdAmr7XXit0EBBKOjUDOOwzgBOyzHWU1Btiw1a9Xsekd9qrjS28VXqwG9THxzFGutOpHyrFu0MpmJsKH7LV2xrgkFQDKYOCNp1pjGrPHk4Xc8/7Us27X6jWo6PV15VAzJKtbMieUUZUKxepXSPcWfENHB8Uj725Hl6I+cnmTEJomrbJucSKKAqFLvDrxGQbYdco7XZXGwApKM9/votNcFOxFdGa0vAgMBAAEwDQYJKoZIhvcNAQELBQADggIBABw3owbhcCqmUeQODM7+e4u+lrCc0T3etBFdyjFqFsiI4v7RMpllKWldX/4JyQ1bRgVfdokKPTnDhL6sJyBJYyCvlCeiC4xa5xbm3Ui0AjodITNX9DzNmYIMi67RmQ39SmoC0/D0HsMRe/ybfpreoQhF15xQK+LG+BJ1kwgTyB655oE/1Bx/+y0kS3sGG/LeDomQ6PXEZoerftKeWDMwVWadBdngX6x50FOVJFDeJaDM5l3tfXG7OEyRKBYkK/Z+QT5caLGmFFKHaUzSIwhcwHOEsFAux76omD37k3twkSlRIC1ZoS80yRDxYsMi6E/Fgy06BRKFpaDbniNMwN6l6DqzAPGK6wFjkoBbjbyWnUDPuEls7RrTVT/VBtlFOMmILIdM1uXgVgMLXmqwcuFiYdYWC4i7WTJh2mQSQMnwg9S7hhdCGmLZH4hmFegIx/1siM2Ce5WUK9nG5jsfhfOS1hIt8EKruCDv+yrWcgn+NiPA5y5q+o8JeY3CDSKM/Al8bOr7TxNNkiwPKpsizHBFmDvIt8de+SCgwVSBsgpGd/XKol0LvMeI1nifs4DMxrdXPXBGpjoEGE95EO5l6T+ch/UpZTFacV+ICfEwPYr/9B3c96tqhaA1cY36/7KUxD59NkUnyRXpnZcpQ3nBSYFNKLuijbCkMvbSfQUqY4hDfFxA</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
@@ -54,4 +56,12 @@
<md:GivenName>Humlab Support</md:GivenName>
<md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Humlab Support</md:GivenName>
+ <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>UmU Incident Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/visp.humlab.umu.se.xml b/swamid-2.0/visp.humlab.umu.se.xml
index 463a0aba..f6137a37 100644
--- a/swamid-2.0/visp.humlab.umu.se.xml
+++ b/swamid-2.0/visp.humlab.umu.se.xml
@@ -19,6 +19,8 @@
<mdui:Description xml:lang="en">Humlab infrastructure for an online research flow regarding speech data</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://visp.humlab.umu.se/om</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://visp.humlab.umu.se/about</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="encryption">
@@ -34,6 +36,7 @@
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.visp.humlab.umu.se/auth/realms/visp/broker/Umu-id/endpoint" isDefault="true" index="1"/>
<md:AttributeConsumingService index="1" isDefault="true">
<md:ServiceName xml:lang="en">Required attributes</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Obligatoriska attribut</md:ServiceName>
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
@@ -53,4 +56,12 @@
<md:GivenName>Humlab Support</md:GivenName>
<md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
</md:ContactPerson>
+ <md:ContactPerson contactType="administrative">
+ <md:GivenName>Humlab Support</md:GivenName>
+ <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:GivenName>UmU Incident Response Team</md:GivenName>
+ <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>