From c60af4584e91d2970c52e70fc7ea98a7d94fbc20 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Fri, 1 Apr 2022 10:38:24 +0200
Subject: SWAMID-810 Updated shib-idp-2.oru.se

---
 swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml | 127 ++++++++++++------------
 1 file changed, 66 insertions(+), 61 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
index ab63cad8..3eb0f8d7 100644
--- a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
@@ -4,21 +4,21 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-05-05T11:27:38Z">
       <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" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion">
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <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 NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
+      <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:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+      <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/hide-from-discovery</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor 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: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://shib-idp-2.oru.se/idp/shibboleth">
-    <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://shib-idp-2.oru.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Örebro universitet - utfasad</mdui:DisplayName>
@@ -30,6 +30,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</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://www.oru.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.oru.se</mdui:InformationURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>oru.se</mdui:DomainHint>
@@ -37,8 +40,8 @@
         <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -63,8 +66,8 @@ WVSpbBf+Iky5/3hSJbjO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -89,8 +92,8 @@ BAZNocu/Hh/kGS7R/8vneg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -115,25 +118,25 @@ d3hB7quCN72lcAz/8iZU
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-2.oru.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-2.oru.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -158,8 +161,8 @@ WVSpbBf+Iky5/3hSJbjO
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -184,8 +187,8 @@ BAZNocu/Hh/kGS7R/8vneg==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -210,30 +213,32 @@ d3hB7quCN72lcAz/8iZU
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">ORU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.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:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">ORU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">ORU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Örebro universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Örebro University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oru.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://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:EntityDescriptor>
-- 
cgit v1.2.3