SWAMID-838, Updated idp-test.it.su.se

1 files changed, 49 insertions, 71 deletions

diff --git a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
index 6b339a19..61779f12 100644
--- a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
@@ -5,19 +5,19 @@
       <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>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="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">
-        <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>
+      <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:AttributeValue>https://refeds.org/sirtfi</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>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" 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-test.it.su.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" 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-test.it.su.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">su.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Stockholms universitet (test)</mdui:DisplayName>
@@ -35,32 +35,8 @@
         <mdui:DomainHint>su.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC+jCCAeKgAwIBAgIJAKvigKUJvExYMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWlkcC10ZXN0Lml0LnN1LnNlMB4XDTEwMTEwOTA4NTAxNVoXDTIwMTEwNjA4
-NTAxNVowHDEaMBgGA1UEAxMRaWRwLXRlc3QuaXQuc3Uuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDiy33V1Re/N5Wih2L/TFGyAvHhzmOvT2BS3z6s
-Gtum+WYGbVaGrJK6fD+HG89KoMtbbo8uAW0HJfhnOdbbUL2OEUo8quKbJSq5A/+0
-d7zCxteeZOBZ9yQF/cTNtgwVdreYitKD8E0LsTUBnpmomGS4icR3b3KyDVdgexof
-85boL4QYGtDvvBLAR67YHnzFl6sMYY46/ptThge8FrRYE4IzMT7JiOzakrCje8tI
-dDHjLFgIjR4e/oOD/qe/VQBBx+BXYOGK80iq5Q1I/MCIcYPNgu4QRaBM6sgCEbzZ
-BAKvKUwOUG6ISQMClGjpzgGd22OClxXcjakMFuWHEDCh13IdAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWlkcC10ZXN0Lml0LnN1LnNlMB0GA1UdDgQWBBTENxJoYSkc0MtD
-9crsO+Sb8o1vmTANBgkqhkiG9w0BAQUFAAOCAQEATQcvg19g3IBDwwTVfMFTVfFc
-ltpedRKvdiS2XNq2jy+/97n2M2Xc4vpUqKJayxwpkN180VCV873zbI81MRCApeJH
-wFYke5r9OSwriiTPgijAAOm6K8++PfNfYOOoo/G/7akcL4dmeu8vKzwE67GAPm+N
-+uRvOFivpJ137xlATclXtP4riW0fqagqQDKwJVULLfyeve8+mDlpYg2/dz5hqb6V
-UebM+vdVeYb0JLMqQevfKMQVbhC3sLuZEGHLh0VE/ZSY5GQGDAshuw0e7Xfrxcd6
-0P3iPg1br/W070Wfs66Q90o0xXbVvA/HJyxelHanrZszCvDN6RzhhDYA3jlqzw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -89,38 +65,40 @@ i5Njb3NXTdej0Y7FgTe1F/IfGOS4KxKJEG0=
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Stockholms universitet (test)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm University (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Incident Response Team</GivenName>
-    <EmailAddress>mailto:irt@su.se</EmailAddress>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SU</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet (test)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Stockholm University (test)</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="administrative">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Stockholm University</md:Company>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:irt@su.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>