SWAMID-1031 Updated idp.test.antagning.se

1 files changed, 81 insertions, 52 deletions

diff --git a/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index 0137e9ea..71bc5648 100644
--- a/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -5,14 +5,14 @@
       <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: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>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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.antagning.se/aws-idp">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol 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.antagning.se/aws-idp">
+    <md:Extensions>
       <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Antagning.se - Test</mdui:DisplayName>
@@ -21,9 +21,15 @@
         <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
         <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
         <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-definition/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-definition/</mdui:InformationURL>
+        <mdui:Logo xml:lang="en" height="52" width="205">https://www.test.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.test.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-provider-policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-provider-privacy-policy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -31,21 +37,30 @@ MIIDEzCCAfugAwIBAgIJAISr5vVr4OFKMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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://idp.test.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.antagning.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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFEDCCAvigAwIBAgIJAINH1nM/OMFgMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0yMjA2MDgwOTQ5MzRaFw0zMjA2MDUwOTQ5MzRaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMb11JbuqNZCVhpKMQf8LlGKEtiJuAU9+RNzkAvuQuwTb2XCgGeRvYcVhQM2NwOU2ogkf6FepUN+1nqyzMKWo5v81QR58f1NGTwLNMxo0C3GjzpvCHy1fYdpLP7PfR/QwDA7T7CdSe1L/91ru2OIHJRSyMrwEUvLvr5bloDTTq+ov1ZcUJ/4rv+vxefRviNGcEToRXBigY56SVK0ybjiMYsbw0O6i7IQp2D3TaQICe4cGsPGE18hBTNc2oFDIrwB6iIiT4uvamH/g6rc62Kcu8c/6lBqoda+nTLIDZw/l+hE2V/YHiq/OPRQOUh1HvSl1eSp49EVaG6SRnOTugcLF29Fg14NPjDVTGZHcPPtSdjNSV6aRrIvDyBQxcx7zICv1KTFv+uvVdJotW9Wyl7EQvObPI6yi1E1BGOeANQG7QJR7zqljfPGKs2og2729pXKTXyo+4+oldErh1vNPGPT4fxCyLUd9ZRGwingrAcRY0OB6vMCILyhaoKDCYJ5ovaiza69hQj1quhTT2GiuQL3jEmeQhHRuFjy4QUF8np/Q6f/DIHqwi+ZE/DLNCb40bpnh0NdgJkDm+PAU0yE+R+EQA4l7pMYtYqDg3KZYYA6zLy4+zvaa6bxwD3iK0WNEfUdqeXVzeoljP/2VeGICR4Y5z+/FpMm/tRJyCXyM+22+sNzAgMBAAGjTTBLMB0GA1UdDgQWBBS10u7lvxpbq8QoN8qeIZFcGWWPpTAfBgNVHSMEGDAWgBS10u7lvxpbq8QoN8qeIZFcGWWPpTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAMVuQoX1mJFKGZNRJhS+ssQxd4N4m3dF1GE+JBx4Rs+n6C51YjyfCiI33bsqRAP3AP6Ntu0MctW0l3NDbcIHSBXFayxGPLrv5AnLNAUzJkthVF3m2svam1XxS1xiVEElkkzZhoP4ZU/vtsOucNzq8R0zVVfv7imc191GFKbPuxjRdckUHJlMQW+n6PCFCzLLIt/3qLn1kHTbfQ9fi50mGau7kBdgxmvl9NCscdHJEK4Uncu1IZe87suIYzaXavBLxr6cnm11vRPMnSsX6T6nP/Hu2eMNt0lccjIGlknCWIvoWcyLviaaKy/gEQH5V5uDHt6Oj7HznfnWY1Nvm0coz26Ne0uSTnV10o7rX0brn2nqd+mYAiFAevoM0GguIlX8YkiWRYOE1rSv2TLZIainjZnMQdniv0dZFtU+VHj6Fo+MjxigyWdgngiN95tl2rXxW/bPGyiQaOCahRcSixP/OMC53PpdJyYeyFxlyLTBB6xyZK5MSHqwOBPB1+5Oj+G3XgOt0Vrp+AlA5XieuJNrGpL98HbIrSMJpNLjGzsCS9m3Uhqw0r5/c04y4AB4gD2kCUNjZctXCbm0d4L5dTAEpYGCW6igYlGcaSzwPHHMGEXQWnt6JpepNLpqA5ICnkt7j+ZGqYEcR+XOqFV47+79TuxM1V8Y3jJRxbORpw1VKQ1w==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <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://idp.test.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -53,34 +68,48 @@ MIIDEzCCAfugAwIBAgIJAISr5vVr4OFKMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UHR</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Antagning.se - Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Universityadmissions.se - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Universityadmissions.se</Company>
-    <SurName>Håkan Pettersson</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Universityadmissions.se</Company>
-    <SurName>UHR Systemdrift</SurName>
-    <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
-    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFEDCCAvigAwIBAgIJAINH1nM/OMFgMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0yMjA2MDgwOTQ5MzRaFw0zMjA2MDUwOTQ5MzRaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMb11JbuqNZCVhpKMQf8LlGKEtiJuAU9+RNzkAvuQuwTb2XCgGeRvYcVhQM2NwOU2ogkf6FepUN+1nqyzMKWo5v81QR58f1NGTwLNMxo0C3GjzpvCHy1fYdpLP7PfR/QwDA7T7CdSe1L/91ru2OIHJRSyMrwEUvLvr5bloDTTq+ov1ZcUJ/4rv+vxefRviNGcEToRXBigY56SVK0ybjiMYsbw0O6i7IQp2D3TaQICe4cGsPGE18hBTNc2oFDIrwB6iIiT4uvamH/g6rc62Kcu8c/6lBqoda+nTLIDZw/l+hE2V/YHiq/OPRQOUh1HvSl1eSp49EVaG6SRnOTugcLF29Fg14NPjDVTGZHcPPtSdjNSV6aRrIvDyBQxcx7zICv1KTFv+uvVdJotW9Wyl7EQvObPI6yi1E1BGOeANQG7QJR7zqljfPGKs2og2729pXKTXyo+4+oldErh1vNPGPT4fxCyLUd9ZRGwingrAcRY0OB6vMCILyhaoKDCYJ5ovaiza69hQj1quhTT2GiuQL3jEmeQhHRuFjy4QUF8np/Q6f/DIHqwi+ZE/DLNCb40bpnh0NdgJkDm+PAU0yE+R+EQA4l7pMYtYqDg3KZYYA6zLy4+zvaa6bxwD3iK0WNEfUdqeXVzeoljP/2VeGICR4Y5z+/FpMm/tRJyCXyM+22+sNzAgMBAAGjTTBLMB0GA1UdDgQWBBS10u7lvxpbq8QoN8qeIZFcGWWPpTAfBgNVHSMEGDAWgBS10u7lvxpbq8QoN8qeIZFcGWWPpTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAMVuQoX1mJFKGZNRJhS+ssQxd4N4m3dF1GE+JBx4Rs+n6C51YjyfCiI33bsqRAP3AP6Ntu0MctW0l3NDbcIHSBXFayxGPLrv5AnLNAUzJkthVF3m2svam1XxS1xiVEElkkzZhoP4ZU/vtsOucNzq8R0zVVfv7imc191GFKbPuxjRdckUHJlMQW+n6PCFCzLLIt/3qLn1kHTbfQ9fi50mGau7kBdgxmvl9NCscdHJEK4Uncu1IZe87suIYzaXavBLxr6cnm11vRPMnSsX6T6nP/Hu2eMNt0lccjIGlknCWIvoWcyLviaaKy/gEQH5V5uDHt6Oj7HznfnWY1Nvm0coz26Ne0uSTnV10o7rX0brn2nqd+mYAiFAevoM0GguIlX8YkiWRYOE1rSv2TLZIainjZnMQdniv0dZFtU+VHj6Fo+MjxigyWdgngiN95tl2rXxW/bPGyiQaOCahRcSixP/OMC53PpdJyYeyFxlyLTBB6xyZK5MSHqwOBPB1+5Oj+G3XgOt0Vrp+AlA5XieuJNrGpL98HbIrSMJpNLjGzsCS9m3Uhqw0r5/c04y4AB4gD2kCUNjZctXCbm0d4L5dTAEpYGCW6igYlGcaSzwPHHMGEXQWnt6JpepNLpqA5ICnkt7j+ZGqYEcR+XOqFV47+79TuxM1V8Y3jJRxbORpw1VKQ1w==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <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:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Antagning.se - Test</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Universityadmissions.se - Test</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Universityadmissions.se</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Universityadmissions.se</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Universityadmissions.se</md:Company>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Universityadmissions.se</md:Company>
+    <md:GivenName>UHR Systemdrift</md:GivenName>
+    <md:SurName>UHR Systemdrift</md:SurName>
+    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>