Resolves SWAMID-3632

3 files changed, 110 insertions, 0 deletions

diff --git a/swamid-2.0/gitlab.speech.humlab.umu.se.xml b/swamid-2.0/gitlab.speech.humlab.umu.se.xml
new file mode 100644
index 00000000..35700c17
--- /dev/null
+++ b/swamid-2.0/gitlab.speech.humlab.umu.se.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://gitlab.speech.humlab.umu.se">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Humlab Speech</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Humlab Speech</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Humlabs infrastruktur för taldata</mdui:Description>
+        <mdui:Description xml:lang="en">Humlab infrastructure for speech data</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://speech.humlab.umu.se/om</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://speech.humlab.umu.se/about</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFZTCCA02gAwIBAgIUIeUiHv3nOcACNy6RasqJRQsPZQQwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDAeFw0yMDEyMDMxNjEzMjRaFw0zMDEyMDExNjEzMjRaMEIxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjBiLso4/FyBDNw4McVDgzbDhoBF8whd4uGQcztvj3OqYURQd7NbZ7NKyfiO8tdw7coJr4cN1QfMWHRj5UFu0VChu6P7h91D6tI8d1/n2NhRNRY24NHdmrN4YZae4sz8q6vK/85VCDUuoGxN6ERyR8so4GMc+TBFUSW6qR9Pnino5MgGpSoMrOZzNUpgbosFdum0LjNh+eDsJJidMDWpLe4Kb/hwhDnAFmSX8oolhy16xv3pGDVkJ1sxyn2JlnHpdDEC5DcqPnE2HTIJAqTNK3FwlD6aVqIkW+Sp7TGwWPdCPVFLxaC1hOBOsqHrejh+XwNlkZvUfaW3JfMvbOiqQdNKsSJ0ifSqZ/hXyc2kFNP3kyZYd/5n8wzjy5sxPY3n84I1BgIXuQHACkwTUxzCZF5ACOb317337LOGRwtQVRxU0AnA45IA8aomaoLgVRlKpssAplJGRgkoZf8nBGh4KgNS9rhQoeGxqXfB1Rgm7e9nqwiA9njWOFxI9QL5V3octNc4BAJQ24DKRFcoYddN4Z+MAbikdqLtP1Nq/ZYUvNP2737577beEBh6bFhehNA1B1OES/bvBsX5qIPIoVnxhQI1Ee8sfEiFX4agVuA/H6/Z2OxypL2yl6QzwhyQLeNcN0XTzItWWtR2kLyayK8vCn+Bp2DOv6xWrpj+zy4jNcjQIDAQABo1MwUTAdBgNVHQ4EFgQUuJxz/nF8jK/8gab/0yVu2G/doVUwHwYDVR0jBBgwFoAUuJxz/nF8jK/8gab/0yVu2G/doVUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAAEE2B3k2hPxJlMaE3gQVSLJiOWOCOo/ApzsLNwkjdkaIwjtDCMkHNvJ9V7PFbD7QAfWVKaPOqtYadqBNgMPp/195V4kEBMvFFT4TyYuj/pPBA0ukY06aXMCtBgZSLnUiYyypNI2TW+Nhz2t1mpGuXwwV7wpPgk14wW/Sfw88gAsQMXxCg5BCxBfLh2IE22c7rbeR/WjVtLyUV9Dmp/mAfxoYBp9+TsrAzfXF+/xI77bYbCzKGZy1cAIEq8GYmTtPLhdJG07X5Acm42s+OokxRHhUxcZjpr2cZG5T4h17e2t46EbVI7ZcTY39ZewEiDMM4n0HRN5DYz7QHLYEjcYiGPaKAYJP8TRLMDYwgoGlqlk/agvkYvAQ3cHmd8Xj7LgHUmswsGCnn7DEp2nnLn4lj0cwnAhA55RV1oyDqKP4Dq1GmoEFJ+qY3S1vs+llzaTlE3RaWKoYwnPauo7egKaDWq7gklzf0MfE0PGCV0eIIjBkO0KPZS+x06k52nIY8guS4+mGqh6KJqzB4WdoC2ockolnM7z6aMJTvgYp2Gotklv/OPtf/PYNdYyBShyZgxP+meReld/1ljZVc+AIA7fzsUJv3cE2MVyTOPNNv0lyuFOLPxV+jK/YP7YNYrx1ytHg0j8shQvDeNFOnWxelsmSnfQMfAA1hk2tqwQBSOBunNA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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://gitlab.speech.humlab.umu.se/users/auth/saml/callback" index="0" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="en">Required attributes</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">UMU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://umu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan von Boer</md:GivenName>
+    <md:EmailAddress>mailto:johan.von.boer@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Humlab Support</md:GivenName>
+    <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/speech.humlab.umu.se.xml b/swamid-2.0/speech.humlab.umu.se.xml
new file mode 100644
index 00000000..5683d24c
--- /dev/null
+++ b/swamid-2.0/speech.humlab.umu.se.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://speech.humlab.umu.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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Humlab Speech</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Humlab Speech</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Humlabs infrastruktur för taldata</mdui:Description>
+        <mdui:Description xml:lang="en">Humlab infrastructure for speech data</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://speech.humlab.umu.se/om</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://speech.humlab.umu.se/about</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFZTCCA02gAwIBAgIUIeUiHv3nOcACNy6RasqJRQsPZQQwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDAeFw0yMDEyMDMxNjEzMjRaFw0zMDEyMDExNjEzMjRaMEIxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjBiLso4/FyBDNw4McVDgzbDhoBF8whd4uGQcztvj3OqYURQd7NbZ7NKyfiO8tdw7coJr4cN1QfMWHRj5UFu0VChu6P7h91D6tI8d1/n2NhRNRY24NHdmrN4YZae4sz8q6vK/85VCDUuoGxN6ERyR8so4GMc+TBFUSW6qR9Pnino5MgGpSoMrOZzNUpgbosFdum0LjNh+eDsJJidMDWpLe4Kb/hwhDnAFmSX8oolhy16xv3pGDVkJ1sxyn2JlnHpdDEC5DcqPnE2HTIJAqTNK3FwlD6aVqIkW+Sp7TGwWPdCPVFLxaC1hOBOsqHrejh+XwNlkZvUfaW3JfMvbOiqQdNKsSJ0ifSqZ/hXyc2kFNP3kyZYd/5n8wzjy5sxPY3n84I1BgIXuQHACkwTUxzCZF5ACOb317337LOGRwtQVRxU0AnA45IA8aomaoLgVRlKpssAplJGRgkoZf8nBGh4KgNS9rhQoeGxqXfB1Rgm7e9nqwiA9njWOFxI9QL5V3octNc4BAJQ24DKRFcoYddN4Z+MAbikdqLtP1Nq/ZYUvNP2737577beEBh6bFhehNA1B1OES/bvBsX5qIPIoVnxhQI1Ee8sfEiFX4agVuA/H6/Z2OxypL2yl6QzwhyQLeNcN0XTzItWWtR2kLyayK8vCn+Bp2DOv6xWrpj+zy4jNcjQIDAQABo1MwUTAdBgNVHQ4EFgQUuJxz/nF8jK/8gab/0yVu2G/doVUwHwYDVR0jBBgwFoAUuJxz/nF8jK/8gab/0yVu2G/doVUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAAEE2B3k2hPxJlMaE3gQVSLJiOWOCOo/ApzsLNwkjdkaIwjtDCMkHNvJ9V7PFbD7QAfWVKaPOqtYadqBNgMPp/195V4kEBMvFFT4TyYuj/pPBA0ukY06aXMCtBgZSLnUiYyypNI2TW+Nhz2t1mpGuXwwV7wpPgk14wW/Sfw88gAsQMXxCg5BCxBfLh2IE22c7rbeR/WjVtLyUV9Dmp/mAfxoYBp9+TsrAzfXF+/xI77bYbCzKGZy1cAIEq8GYmTtPLhdJG07X5Acm42s+OokxRHhUxcZjpr2cZG5T4h17e2t46EbVI7ZcTY39ZewEiDMM4n0HRN5DYz7QHLYEjcYiGPaKAYJP8TRLMDYwgoGlqlk/agvkYvAQ3cHmd8Xj7LgHUmswsGCnn7DEp2nnLn4lj0cwnAhA55RV1oyDqKP4Dq1GmoEFJ+qY3S1vs+llzaTlE3RaWKoYwnPauo7egKaDWq7gklzf0MfE0PGCV0eIIjBkO0KPZS+x06k52nIY8guS4+mGqh6KJqzB4WdoC2ockolnM7z6aMJTvgYp2Gotklv/OPtf/PYNdYyBShyZgxP+meReld/1ljZVc+AIA7fzsUJv3cE2MVyTOPNNv0lyuFOLPxV+jK/YP7YNYrx1ytHg0j8shQvDeNFOnWxelsmSnfQMfAA1hk2tqwQBSOBunNA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://speech.humlab.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://speech.humlab.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://speech.humlab.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://speech.humlab.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <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://speech.humlab.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://speech.humlab.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://speech.humlab.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="en">Required attributes</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">UMU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://umu.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan von Boer</md:GivenName>
+    <md:EmailAddress>mailto:johan.von.boer@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Humlab Support</md:GivenName>
+    <md:EmailAddress>mailto:support@humlab.umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index e5d95acc..207ff0c9 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -49,4 +49,6 @@
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml"/>
   <xi:include href="swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/speech.humlab.umu.se.xml"/>
+  <xi:include href="swamid-2.0/gitlab.speech.humlab.umu.se.xml"/>
 </md:EntitiesDescriptor>