SWAMID-2385: Updated confluence-test.it.su.se

2 files changed, 89 insertions, 7 deletions

diff --git a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
index b9eb456c..7428f3bc 100644
--- a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml
@@ -24,9 +24,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
-      <samla:Attribute 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 Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -41,9 +41,13 @@
         <mdui:DisplayName xml:lang="en">Confluence test at Stockholm University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Confluence test vid Stockholms universitet</mdui:Description>
         <mdui:Description xml:lang="en">Confluence test at Stockholm University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.su.se/medarbetare/it/it-tj%C3%A4nster/administrativt-st%C3%B6d/samarbetsyta-confluence-1.290329</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.su.se/medarbetare/it/it-tj%C3%A4nster/administrativt-st%C3%B6d/samarbetsyta-confluence-1.290329</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/confluence-privacy-policy-1.640237</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/confluence-privacy-policy-1.640237</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:KeyName>confluence-test-app03.it.su.se</ds:KeyName>
         <ds:X509Data>
@@ -70,8 +74,52 @@ seIrBo4lz117O2/JMzKjRzRgJraAelinFL6cu4TbVaVneyOkhlOR8qFtcEx+i5Mm
 r3Of2b76/705PzMWVH0QOFG5dI/Vp4UaAnT7G7M33KcCDGMLyX1h1jRm0evRY2wV
 DkVi8rhkhfC+HzhCzFd3B6LlNbtzEY74JOI01xktNRKmGJ4UC5oZkjtO4lYWzzqR
 i4lRFrKqh1ze2OqqLROzei117aGJXO+xaa57MR28HkFBqQ7pClyDm5GCZye/4U/d
-KnSuicI=
-</ds:X509Certificate>
+KnSuicI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>confluence-test-app03.it.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=confluence-test-app03.it.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFITCCAwmgAwIBAgIJAOLsaV2bAh4QMA0GCSqGSIb3DQEBCwUAMCkxJzAlBgNV
+BAMTHmNvbmZsdWVuY2UtdGVzdC1hcHAwMi5pdC5zdS5zZTAeFw0yMjEyMDgxNjI3
+MzFaFw0zMjEyMDUxNjI3MzFaMCkxJzAlBgNVBAMTHmNvbmZsdWVuY2UtdGVzdC1h
+cHAwMi5pdC5zdS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOkj
+gn4WHrgsqKdRSncAfAyOc/Gh4d8rvdX8i/1Yq7sGKQz2AoI7D7xNgswDpA4AiQCE
+rnjvxw/6wMYgIk0dnHFE+tKxL5J5s2bzAIugzrEoQvMdM6vceBVoqHKzwuCxTpp2
+Qtiyap1XjLaomI5yGpe4ZFAUuEffUHb5wqIAxh1WCUqnO1CcW6yaF+p0rQTbAPg4
+APfkO4t5RsYz9bMrsXnIGcuazvGZecqY2bPyUWV3kdnac7SQ7EwU4Wm78UlnI8q3
+vqgFHPiy/kR/GV59B6b04KyteRpo5jEYcYppJjLCv4DcujzDJZL1ALFcrMCdBKgw
+bOuJ3imFa+pGl/VaSy3LmfsKLRiX/HrYuCtem/3XiVaGNKD6KhsPTB5d5+vKumzd
+uOm0ei2f13Cv6cCiwfv8JdLee/MSvihq7Dl0hnpddc5AB08mzNQREhx82FGEeoND
+ykayqY+5e6p7wYjJgGlG1Y0/hyGbBrQqVrRDn9DAfzDJ0+1lUeDgvDq8JvmTf5R4
+cDLglVQ4oM+Aaw42PtitMUwnIZ5k2FdhRppl/foV+Kw9nS9D7YGoosiVH2HJQupg
+x/WCAcVtaPSyHQPdFnUTRjt+cBF03FZZ92CLsBjuHWh7TfWGy7Qz5ff6m3CTskyK
+t4c/2gQYA/d+x5YUSaMfK43rhV37FNqjT+YM9ZgVAgMBAAGjTDBKMCkGA1UdEQQi
+MCCCHmNvbmZsdWVuY2UtdGVzdC1hcHAwMi5pdC5zdS5zZTAdBgNVHQ4EFgQULrPw
+Q6LSGhdrmDtt0/Kj4z5hC3kwDQYJKoZIhvcNAQELBQADggIBAK0KcqA6qu8w5Keb
+sV55s/C0UQCDWkjLO8vuLzFR23z8OBr0VxgQHEWHExgq/m55nzYQhjztV1jlqQHL
+Cm41zxzC9fG4kApxjS+Z35y930U3Rsk2RQdWSpzsxSQd/hGwNkidNuiV4Nm8Nynr
+cbVi5RvhKGnP9tYhiXtZ9lEBC066pIwnFF1eO/hssKwlO2sC6mFMZM9MfV9lolkW
+io7kyby7TQBfgdFKJt4u3sF1/tdP8USnpZqk2D0pR+ygOTA4R0GKvXfqk5JZIhRu
+0VcAJHnznzM4il9YaHlK3UBVN2f5qWraQL1RmVSfFwlg13Ah0TibGXAdh5krtS9h
+kCJeqi3w3ryeZIWvvi0UcuZbFW2YMho1TvlQ9w1d82ryo3FfRI7XEeCMJbJDdiEQ
+4GcjeE2AAKmuw5/8t4f2pIXrWr5KJvGJqqfQJE6yhhkdQ5uztjWZgz3AAYInPZMW
+b4rIiK5WnoKpVbMPLq1l4MfIJ2NSzDAizgyWryacuG0FJD3f3Uo/6MDqM21C7Owv
+WKa3HcjjUxwXTpdIYdgi0RkXWo6xKxBZVV2nF3N2dcshxlArNMxRBhWyCcp4p1f+
+b75rieg7UyfG11PbCBnO1rv+XEghqLYAx/4HdbYol6uBsYcQnCEGPTqSmfqcAbZf
+++bRksnumXomUl52NJfDqB2JRz1S</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -91,9 +139,43 @@ KnSuicI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Confluence test at Stockholm University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Confluence test vid Stockholms universitet</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Stockholms Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.su.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.su.se/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.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>IT-avdelningen</md:GivenName>
+    <md:SurName>IT-avdelningen</md:SurName>
+    <md:EmailAddress>mailto:abuse@su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8d67b5e8..174c80de 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -72,7 +72,7 @@
   <xi:include href="swamid-2.0/cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence-dev.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence-ro.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/confluence-test.it.su.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence.it.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/connect.dev.eduid.se-eduidsp.xml"/>