From aad530fef864e824d8438f5b3c005d93befe610d Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Fri, 21 Jan 2022 15:50:02 +0100
Subject: SWAMID-637 Updates to https://idp.oru.se/idp/shibboleth

---
 swamid-2.0/idp.oru.se-idp-shibboleth.xml | 125 +++++++++----------------------
 1 file changed, 37 insertions(+), 88 deletions(-)

diff --git a/swamid-2.0/idp.oru.se-idp-shibboleth.xml b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
index ab522270..aa472484 100644
--- a/swamid-2.0/idp.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.oru.se-idp-shibboleth.xml
@@ -4,16 +4,16 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-20T12:06:43Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:attr="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>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla: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>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.oru.se/idp/shibboleth">
     <md:Extensions>
@@ -29,6 +29,9 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="sv" height="65" width="90">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
         <mdui:Logo xml:lang="en" height="65" width="90">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.oru.se/english/</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.oru.se/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.oru.se/</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>oru.se</mdui:DomainHint>
@@ -42,36 +45,6 @@
         <ds:X509Data>
           <ds:X509Certificate>
 
-MIIDajCCAlICCQDPtp194yuCkDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
-RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
-IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
-Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
-CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
-CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
-hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQD5X28gK3MZqbILw3CpDNtvQXXNLL+Yu4/RBTEGJPe52agsbFtOmTNTAX36
-E5mbJkl8dJA7JZEDbb+n5pqNX29S3ByBoxh5KYyU8bGqqdBS+gnktEMp2Ov5YTlV
-AJ3Oh+fbeC7XoZGfiRQAcQsevuJmYX1ciQnY+Z7Zw6nJX30gpPbQnCQ8WvxGpX0g
-p1fKph/5C8tUCiQQHW7sTPOWQoHSt+NEUYiyTIZUVnMfzpFmeVoFAdCo6xCaR17+
-tc46TCygoUqSWX3i6qtYmHojMk3AnIIszveJMc2EnT/m5cUa05T0nPDE2COefXt9
-5axrvykxYDWE76wid9tZsOrFdspFAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABp9
-YIbANYrIRwg9a5gR5r8Mfkf3VwUCxo0wGp0X6VnJCvpwNcL+fRNf3AmQEE+6+vTk
-7t9LqlCNzSfRbk9VqZK5CSp0mUDRr0tIWZxxU8bYvGT8Mn60r+Ng93SzOCOJx6k2
-vjDDESiNR5pKJ7WisTVLVa7Ve2YIRcc7IPZPZGQRM26XlnBjOMJ4MZMNxwSlj+2b
-Ipb5f9y5AjrkI3FpHE0gHNl0gzFa6Hd2Cfn+rw+GGrWrcz5KscFu5Z6nhxN2KKlS
-Km7JSP1DHVWSbdtYwRFn1Lw2daDfLxUD9eWQpydycMRvNTaqwGOR90sJbzRvN0tb
-lG3tGJ938zt7FPeuL04=
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
 MIIDCzCCAfOgAwIBAgIUVA3oHFEZDVPBIzyhnqLguPcc7h0wDQYJKoZIhvcNAQEL
 BQAwFTETMBEGA1UEAwwKaWRwLm9ydS5zZTAeFw0yMTA1MDMxMzI4MTRaFw0zMTA1
 MDExMzI4MTRaMBUxEzARBgNVBAMMCmlkcC5vcnUuc2UwggEiMA0GCSqGSIb3DQEB
@@ -91,36 +64,6 @@ Z+PdjawDyfZMtGQB0PMh6aujcMDxDUcckEijoRJ/K38IeWPQouOB+aslYLEGQP+F
 NPlPEBgbuu0qhyaDywQe
 
 
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDajCCAlICCQDs5xxKpaMg9TANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJT
-RTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UECgwRT3JlYnJv
-IFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkqhkiG9w0BCQEW
-Cm5vY0BvcnUuc2UwHhcNMjAwNTEyMTIzODExWhcNMjEwNTEyMTIzODExWjB3MQsw
-CQYDVQQGEwJTRTELMAkGA1UECAwCU0UxDzANBgNVBAcMBk9yZWJybzEaMBgGA1UE
-CgwRT3JlYnJvIFVuaXZlcnNpdHkxEzARBgNVBAMMCmlkcC5vcnUuc2UxGTAXBgkq
-hkiG9w0BCQEWCm5vY0BvcnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDjMaVhR0rA07ogCcVXpPgZGGjD8TGacWfuNhYq+Mxqfj0VRKCFBapZSjjP
-M8bXnPLm6gNSXINiPUFDMUOqfSa45obO8pZTSWPDJVoPpL1JsshH6aSDw+JRsnA6
-gYtzSL9JXFTJ031SykvSamVkdliSaDbl4GzpHcV6QWG3jn8jJcH/U+ZAMPsRh/hK
-A/l6uTjk+ITmaZQNfDYWSG+/iPWaH9kD+Eu86+2i2OHN+H4vaqjsKOfWRwYFoC1v
-xIBW1s44LcRvMl7i557p0OQHXZSrUGCtFvU/9h+f8O9vUBNJ8SGG0HwcTa86Mmf/
-IAX1thD55Msl5y00jEtKWEFohLJRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADVk
-+DjCPdlGLGxvsoFd/v4Fjyqi+UM/XjopIY92uGfdIikDG0NgO1YKYtOUOnKQudmc
-tB8wrv+ircsgE0Ply4KpSAfEG5jmyIgBNimB177OAxDEldKOpimvBDEjijwVkgHR
-HvlLXkmQ658aCQ3CVbuVlckhhRU43Iv94glUf5htD+vokfadIX/Bdw7A4j3IKnhK
-IjNOUsJnKVdUIBGSipUxDzHiwz9kPJw0FxxxUpfR7NOhOChNvjSnPaErm6v9H/hl
-N53PYLrgu7fMgINxTgPwdv1unfU1kYZUJtFt1I/wYulHEDIU8FPq3G2fdCMexpr+
-qzdjBhUfdsHeXtWHnx4=
-
-
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -290,26 +233,32 @@ wLKze2zbBKT2f9l2kEnb
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">Orebro University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Orebro University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://idp.oru.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen</SurName>
-    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Örebro universitet</Company>
-    <SurName>IT-support</SurName>
-    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen Örebro universitet</SurName>
-    <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Orebro University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Örebro Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Orebro University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Örebro Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.oru.se/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.oru.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>IT Avdelningen</md:SurName>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Örebro universitet</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Örebro University</md:Company>
+    <md:SurName>IT Avdelningen Örebro universitet</md:SurName>
+    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:EmailAddress>mailto:abuse@oru.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3