Merge branch 'master' of git.swamid.se:swamid-metadata

4 files changed, 14 insertions, 67 deletions

diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index 78e6ddee..d5ba33e9 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -58,7 +58,7 @@
       <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Umea University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Umea University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
diff --git a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
index f84784bc..ecdf3d0f 100644
--- a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -188,24 +188,12 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
   <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">
-         Stockholm School of Economics
-      </OrganizationName>
-    <OrganizationName xml:lang="sv">
-         Handelshögskolan i Stockholm
-      </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-         Stockholm School of Economics -- TEST ONLY
-      </OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">
-         Handelshögskolan i Stockholm -- ENDAST TEST
-      </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-         https://www.hhs.se
-      </OrganizationURL>
-    <OrganizationURL xml:lang="sv">
-         https://www.hhs.se/sv/
-      </OrganizationURL>
+    <OrganizationName xml:lang="en">Stockholm School of Economics</OrganizationName>
+    <OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.hhs.se</OrganizationURL>
+    <OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</OrganizationURL>
   </Organization>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <EmailAddress>mailto:gregor.borgstrand@hhs.se</EmailAddress>
diff --git a/swamid-2.0/sdauth.sciencedirect.com-.xml b/swamid-2.0/sdauth.sciencedirect.com-.xml
index 6b2a4439..71b08424 100644
--- a/swamid-2.0/sdauth.sciencedirect.com-.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com-.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <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">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <Extensions>
@@ -51,14 +56,6 @@ HL0Y8cbWSCgsg/Qpi0kb19bSPNLxAB4SAfvYqQSnD8cZOA==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <!--  Valid from Jul 27 13:56:09 2012 GMT to Jul 25 13:56:09 2022 GMT -->
-        <ds:X509Data>
-          <ds:X509Certificate> MIIEoDCCA4igAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx DTALBgNVBAgTBE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xF WElTLU5FWElTMSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAo BgkqhkiG9w0BCQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbTAeFw0xMjA3 MjcxMzU2MDlaFw0yMjA3MjUxMzU2MDlaMIGWMQswCQYDVQQGEwJVUzENMAsGA1UE CBMET2hpbzETMBEGA1UEBxMKTWlhbWlzYnVyZzEUMBIGA1UEChMLTEVYSVMtTkVY SVMxITAfBgNVBAMTGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTEqMCgGCSqGSIb3 DQEJARYbRW1haWxOb3ROZWVkZWRAZWxzZXZpZXIuY29tMIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEArv49mYjjAEm6cINEmhRwPk3amwJjENDm/adyrmDV yo8vP2qV0t1yMkQ4/mjtKNbNtHXdYmHhfKWUvkcfGrWSlTTtL58pzUa1yrAa4/zG 4yMDsu0TRa9mXrJObLyQgbW7UW6k4cYVFYh7NdNUlYYZJlQcnOnzd1vg5YUoTCG7 2bVvN18ECMgmwpetOuU34+C/0VMWmAta11MnI9SVFdBa7/V34Ui3kQURo9rZGBOK X38UCEQaL0t6OaStEVpPOBubbG3Xk/dOCLTqq0L/694oXr38pZLRy+R+PinTTqTL gg2k8d35knIQoQ+/HbTJnTZ+N0RG2Qs8PjQ+saYJtvf8lQIDAQABo4H2MIHzMB0G A1UdDgQWBBRj2Qz+DnqMnI6xhYJHngQCnWxPyjCBwwYDVR0jBIG7MIG4gBSSutEA 8L7ay1vyhalDZtLDe5WNRqGBnKSBmTCBljELMAkGA1UEBhMCVVMxDTALBgNVBAgT BE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xFWElTLU5FWElT MSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAoBgkqhkiG9w0B CQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbYIBADAMBgNVHRMEBTADAQH/ MA0GCSqGSIb3DQEBBAUAA4IBAQAjfpImUzNMumHr2S2vLEsK7z+m7NQNPEarTSYx j+0TNH3W+ylvgjcEprAoXWVEkJEQkvcYHXS8rWqxqZ9zJptPsaqJ/kDEv3i2MguF 4iCRAhUJzNCpIvdpaJ2rDTfLfx2mk+2co78Gx6Ixc5TaUYimoKbWdBgetTLMAT0i EUxAtEgo6M2yacBtQGewYQSnA6/pAiJUlDUBvw0tyEUDs8sAv/LrBFnl/jeYcb4V /khhD8zTvlmaPoCttZyxx/VABsfosRfkEgf52ge02TXsHTvDuKe3GKJUqzqYnuQw 0sdo9tQp3aTFCi0r/pYqPrB21ZIbkQ/xybNtFratD7yuJ3Or </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <!-- auth.elsevier.com is our preferred end-point for AssertionConsumerService Binding, sdauth.sciencedirect.com and shibauth.elsevier.com are maintained for backward compatibility only -->
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml
index 389d097f..292d382d 100644
--- a/swamid-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-2.0/shibboleth.ebscohost.com.xml
@@ -16,6 +16,7 @@
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
     </md:Extensions>
+    <!-- This is the new cert as per SWAMID-116. Expires 10 March 2022 -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>New cert SWAMID-116</ds:KeyName>
@@ -59,46 +60,7 @@ g0Y=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>old cert SWAMIDOPS-8093 can be removed march 2021</ds:KeyName>
-        <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>C=US, ST=Alabama, L=Birmingham, O=EBSCO Industries Inc., CN=shibboleth.ebscohost.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIJALgyIfD0A59WMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE2MDMxMDE1MjczOFoX
-DTE5MDMxMDE1MjczOFowdzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0FsYWJhbWEx
-EzARBgNVBAcTCkJpcm1pbmdoYW0xHjAcBgNVBAoTFUVCU0NPIEluZHVzdHJpZXMg
-SW5jLjEhMB8GA1UEAxMYc2hpYmJvbGV0aC5lYnNjb2hvc3QuY29tMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2gPcVVfIToXQoIDCHnpMExhkoTWQfctB
-TZ6cLbk6/bWJLybaml5l17TXsVrOL4mE/eqog6ws5q86GQD0md/cosu7I/Jk1fSV
-ZDyolgAELvsybjp+Tqv5KHqvNyOdVLVJHOcDB09KbBtWMhfRXjzHe8vSOiBe4/dI
-jpwPnUyPv1nl2v/yx57BUeiLU8CL+LTcQGoVpkoaSyfDYmmkOyJI43jifdGXHxml
-CMfEVVFyHasnS7iRn2xDD5XSb2ZbdKZncoOXVQzsbmVFS4zlX7RYzmwr+K38sXJ4
-JfxQQmrXFiBU7fAJEoqsmNlxtD7X7bFmmVjOYMBQ44lK9GZG6kcBhQIDAQABo4IB
-3jCCAdowDAYDVR0TAQH/BAIwADApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUH
-AwIGCmCGSAGG+E0BAgMwDgYDVR0PAQH/BAQDAgWgMDUGA1UdHwQuMCwwKqAooCaG
-JGh0dHA6Ly9jcmwuZ29kYWRkeS5jb20vZ2RpZzJzMi0yLmNybDBdBgNVHSAEVjBU
-MEgGC2CGSAGG/W0BBxcCMDkwNwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0
-ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wCAYGZ4EMAQICMHYGCCsGAQUFBwEB
-BGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEAGCCsG
-AQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
-cnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeOzDSDMKIz1/tss/C0LIDOMEEG
-A1UdEQQ6MDiCGHNoaWJib2xldGguZWJzY29ob3N0LmNvbYIcd3d3LnNoaWJib2xl
-dGguZWJzY29ob3N0LmNvbTAdBgNVHQ4EFgQUX5a2VOhuB9OZJV9M6FG7Zy+YYYIw
-DQYJKoZIhvcNAQELBQADggEBAApcPOeAAcYKBDL3L6ysJoukwn0vu812N9aPoKQg
-lWwenSV9IgyonbNsGmRQkeE1OEkL8NLZbR8qWHH3nmoUnn/3wHAyBl9jQDk5N0ki
-PGJup923dPOzp9uIHANwPLozwjXxMhelGgARJ6fmrmfKkBqmMpKgC7JLvCNLlDoO
-vm2DNlICTcXGmAigFmZKsi37uVSkFGNiZLlfT9KlucKnmYLxhRczovMumui1tt5R
-FhWhQnewAV8knm60yrMTxcG0VGqbsxiLqacCKuNJvSZIGuCwGwCqWTVPza+7k7Xa
-GXN6t76L1hd4Ant9KFynMa+RET9Mf26Fffpuhk09MVUJqcc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
+    <!-- This is the cert that exists in the InCommon metadata. Good thru 22nd October 2022 -->
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:KeyName>incommoncredsnew</ds:KeyName>