SWAMID-1045 Update idp.antagning.se

1 files changed, 80 insertions, 51 deletions

diff --git a/swamid-2.0/idp.antagning.se-aws-idp.xml b/swamid-2.0/idp.antagning.se-aws-idp.xml
index 92395392..98f09dec 100644
--- a/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -5,18 +5,18 @@
       <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>
       <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: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.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.antagning.se/aws-idp">
+    <md:Extensions>
       <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">www.antagning.se</mdui:DisplayName>
@@ -25,9 +25,24 @@
         <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:Logo xml:lang="en" height="52" width="205">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
+        <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: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>
+MIIFCTCCAvGgAwIBAgIJAOFuNXqb4wcqMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMjIwNjA4MTE1NTIzWhcNMzIwNjA1MTE1NTIzWjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5ZdPJnAj6CEvC1J2jQ8scsmxYy2uP0pXDA1Xqx9nXlXYYO6W7i6ErS+Q8xeJywtIcmbDpwkWclfj7+aJ9vOCG2/B8meA/TiMu8IIkb/WEEJ903CwNf1ONKH+0sBh//k73gHKO5aO7EzA9nxZLld6hGLApB41MUepfPvrysNVKisRW+OTdVbqS8zylzZpkMmzP/jL0Qeiyp7yzt1mUKCU73k4B2Iaeu6k8Tg7ust8ExAkB+fS4ElYgp/R4mZk75rHazcKPq5wVGx2QgttReuhyKEEH9UlnsD0CNfmr7WWpHwCcYVLx1A0s4hEg7jFdA2o8mE2CN72Ku6O8GOIz0mQ2NOX7GGwPhMI4fEBgDoEm5ScQauPL5vH8jbx8IXMjL6WABEFPvs9oLm3/mcRAK+4BxWJ48KL/fvgM4j/rPB+vkjPcbnDfMVMqP+p49s/xQgC2IINAxP0YMIkRvyN9yLWtUleDKBZ/tJfRjvMnyOgP8PbPxiWX8fd/MySMRxioKlEDvXsBZL28B+b9OK+FggATKGQJSBmslPnFHdjVNyoM/MMRZqhTAhe4a2MAsrc8qRybV+pptZe5vempp8hbYwY3ycePMQj1Jd6uaZhkADftkF9NQkbbOVv2jqIKQl3od+k1NHVEH/jYjWjoO+peniJ+i8rztXMIql3W2UV14kDac0CAwEAAaNQME4wHQYDVR0OBBYEFDfB9hFmYadeo5GnFmmYbAmw5bvQMB8GA1UdIwQYMBaAFDfB9hFmYadeo5GnFmmYbAmw5bvQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGxWAI1IVp56C6ycgmRNVleKz3TbdtD02aDhygZFr4QXoWddAY4ZTKgg++NsHkJ7gzxbVNCRUcIFMGFdKVashIIVHKrAB7TPOeV6Ku5ru8zcfGEmHRLpWrh9S50ilmBCDB6B+ps1Jfhh92/pvcNrWNM4VCBlKjOmlFno797U9TpiDWIrDrAltV2QVjDtzF9HCtAYOBA3baAUo+6lUe/YnQxOLiv6Clh2PgQ3qhh2COy2W/HL5roMqstItqurcwERblGDa6zyNuu8eWWt0q5HjyyonowWV5yZaFDyas30v4Iy3lf15OTmbSDZr7LirkQa3RJXfW2dTRKfAufz4dakoVTKEuADXCNa37po9s4nrPuqjCzQ03VIV/+u0qSFuTWdowDtpKO98BCkD/4y47d+FWtZfGdl7fZuj0QiqmBY7o6uh6S4BWbLON0m9FkBeRvrleJeYqnecSmVNp1pOTawIM7EiRyUAa1E4TGHnML8n+04+IXFwBlu7YoWFnGDLiv5AkstO/ukA43j6sF3A3qBtNCwhaCHgnJ51sbvQJrPWWLWtUP8Zx4pr/OS6zdxTbhW783yNrF8h6Ywist9aC+lZlrFk3XAy61sB6187vFPP4S7pOT8i1yNWNfoAwplgBtzFagDcs0kHnyClcq2ZNo6x7zsmudfDolyK9i5iYd+zXsT
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -35,20 +50,29 @@ MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
 	  </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.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:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.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.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.antagning.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.antagning.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.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>
+MIIFCTCCAvGgAwIBAgIJAOFuNXqb4wcqMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMjIwNjA4MTE1NTIzWhcNMzIwNjA1MTE1NTIzWjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5ZdPJnAj6CEvC1J2jQ8scsmxYy2uP0pXDA1Xqx9nXlXYYO6W7i6ErS+Q8xeJywtIcmbDpwkWclfj7+aJ9vOCG2/B8meA/TiMu8IIkb/WEEJ903CwNf1ONKH+0sBh//k73gHKO5aO7EzA9nxZLld6hGLApB41MUepfPvrysNVKisRW+OTdVbqS8zylzZpkMmzP/jL0Qeiyp7yzt1mUKCU73k4B2Iaeu6k8Tg7ust8ExAkB+fS4ElYgp/R4mZk75rHazcKPq5wVGx2QgttReuhyKEEH9UlnsD0CNfmr7WWpHwCcYVLx1A0s4hEg7jFdA2o8mE2CN72Ku6O8GOIz0mQ2NOX7GGwPhMI4fEBgDoEm5ScQauPL5vH8jbx8IXMjL6WABEFPvs9oLm3/mcRAK+4BxWJ48KL/fvgM4j/rPB+vkjPcbnDfMVMqP+p49s/xQgC2IINAxP0YMIkRvyN9yLWtUleDKBZ/tJfRjvMnyOgP8PbPxiWX8fd/MySMRxioKlEDvXsBZL28B+b9OK+FggATKGQJSBmslPnFHdjVNyoM/MMRZqhTAhe4a2MAsrc8qRybV+pptZe5vempp8hbYwY3ycePMQj1Jd6uaZhkADftkF9NQkbbOVv2jqIKQl3od+k1NHVEH/jYjWjoO+peniJ+i8rztXMIql3W2UV14kDac0CAwEAAaNQME4wHQYDVR0OBBYEFDfB9hFmYadeo5GnFmmYbAmw5bvQMB8GA1UdIwQYMBaAFDfB9hFmYadeo5GnFmmYbAmw5bvQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGxWAI1IVp56C6ycgmRNVleKz3TbdtD02aDhygZFr4QXoWddAY4ZTKgg++NsHkJ7gzxbVNCRUcIFMGFdKVashIIVHKrAB7TPOeV6Ku5ru8zcfGEmHRLpWrh9S50ilmBCDB6B+ps1Jfhh92/pvcNrWNM4VCBlKjOmlFno797U9TpiDWIrDrAltV2QVjDtzF9HCtAYOBA3baAUo+6lUe/YnQxOLiv6Clh2PgQ3qhh2COy2W/HL5roMqstItqurcwERblGDa6zyNuu8eWWt0q5HjyyonowWV5yZaFDyas30v4Iy3lf15OTmbSDZr7LirkQa3RJXfW2dTRKfAufz4dakoVTKEuADXCNa37po9s4nrPuqjCzQ03VIV/+u0qSFuTWdowDtpKO98BCkD/4y47d+FWtZfGdl7fZuj0QiqmBY7o6uh6S4BWbLON0m9FkBeRvrleJeYqnecSmVNp1pOTawIM7EiRyUAa1E4TGHnML8n+04+IXFwBlu7YoWFnGDLiv5AkstO/ukA43j6sF3A3qBtNCwhaCHgnJ51sbvQJrPWWLWtUP8Zx4pr/OS6zdxTbhW783yNrF8h6Ywist9aC+lZlrFk3XAy61sB6187vFPP4S7pOT8i1yNWNfoAwplgBtzFagDcs0kHnyClcq2ZNo6x7zsmudfDolyK9i5iYd+zXsT
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -56,34 +80,39 @@ MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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">www.antagning.se</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">www.universityadmissions.se</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:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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">www.antagning.se</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">www.universityadmissions.se</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://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>