SWAMIDOPS-8260

1 files changed, 47 insertions, 13 deletions

diff --git a/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml b/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml
index fb68d49c..685f51f6 100644
--- a/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml
@@ -2,14 +2,17 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogindev.uu.se/idp/shibboleth">
   <Extensions>
     <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml: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-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
+      <saml:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue> https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
       </saml:Attribute>
@@ -19,8 +22,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet (ny)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University (new)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
         <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://weblogindev.uu.se</mdui:InformationURL>
@@ -99,6 +102,32 @@ bB32
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <!-- Certificate from weblogin.uu.se/idp/shibboleth -->
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
+MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -225,21 +254,21 @@ Mu2DZQ==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet (ny)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University (new)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Uppsala University</Company>
     <SurName>SAML2 admins</SurName>
     <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
-    <TelephoneNumber>+46 70 425 0477</TelephoneNumber>
+    <TelephoneNumber>+46184717800</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <Company>Uppsala University</Company>
-    <SurName>John Morrison</SurName>
-    <EmailAddress>mailto:john.morrison@uadm.uu.se</EmailAddress>
-    <TelephoneNumber>+46 70 425 0477</TelephoneNumber>
+    <SurName>SAML2 admins</SurName>
+    <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
+    <TelephoneNumber>+46184717800</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
     <Company>Uppsala University</Company>
@@ -247,4 +276,9 @@ Mu2DZQ==
     <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184717890</TelephoneNumber>
   </ContactPerson>
+  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <GivenName>IT Security Response Team</GivenName>
+    <EmailAddress>mailto:security@uu.se</EmailAddress>
+    <TelephoneNumber>+46184717560</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>