Merge branch 'master' of md-master.swamid.se:swamid-metadata

3 files changed, 77 insertions, 0 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 18a9fce3..3281aeea 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -279,4 +279,5 @@ www07test.sub.su.se.xml
 www4.genuinetext.com-shibboleth.xml
 pingpong.uu.se-Shibboleth.SSO-Metadata.xml
 its-pd0328.ad.umu.se-shibboleth.xml
+idp.antagning.se-aws-idp.xml
 shib-idp-2.oru.se-idp-shibboleth.xml
diff --git a/swamid-2.0/idp.antagning.se-aws-idp.xml b/swamid-2.0/idp.antagning.se-aws-idp.xml
new file mode 100644
index 00000000..8af1d32f
--- /dev/null
+++ b/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.antagning.se/aws-idp">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Antagning.se - ny</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universityadmissions.se - new</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
+        <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:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNDI2MDgwOTI0WhcNMTcwNTAxMDgwOTI0WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNpBNU58qD9eIlsQ8DWnOz+/nEaK1Th/UlDh7qTRWibDmS3pxK5wJ/i9cg1HnnYJSPa1M+ZqtFD3tOqCJsU9USX2V9i62xLwD28gp/TW99aoRQkCt9Eya7AVRxlNSdYEryK3We9Be+w35gbn6nT/0U1bYT//PXU/r9AoNcAp7rKwIDAQABo1AwTjAdBgNVHQ4EFgQU7478/s7WtAeAxh2JHrpKAWBIhRYwHwYDVR0jBBgwFoAU7478/s7WtAeAxh2JHrpKAWBIhRYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA6X1jgxAMFHc9/goAhbkSPExpvsI3zbKmObTsicdLFeyhNTaR0EywUwcNUoSkZXF4cYINy0FuS2A81gRn0KlP8p4iQ8PEZ/DTOEvQNVSxUlPXkxD/yYBVH/FdXH5UskzkdtyK/xFUxfXLNWAZyRB6S8yvpODJMskJL8cApRqrnGA==
+          </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-POST-SimpleSign" Location="https://idp.antagning.se/idp/profile/SAML2/POST-SimpleSign/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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICBDCCAW2gAwIBAgIJAPVea+I+ZF5nMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRhZ25pbmcuc2UwHhcNMTcwNDI2MDgwOTI0WhcNMTcwNTAxMDgwOTI0WjAbMRkwFwYDVQQDDBBpZHAuYW50YWduaW5nLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNpBNU58qD9eIlsQ8DWnOz+/nEaK1Th/UlDh7qTRWibDmS3pxK5wJ/i9cg1HnnYJSPa1M+ZqtFD3tOqCJsU9USX2V9i62xLwD28gp/TW99aoRQkCt9Eya7AVRxlNSdYEryK3We9Be+w35gbn6nT/0U1bYT//PXU/r9AoNcAp7rKwIDAQABo1AwTjAdBgNVHQ4EFgQU7478/s7WtAeAxh2JHrpKAWBIhRYwHwYDVR0jBBgwFoAU7478/s7WtAeAxh2JHrpKAWBIhRYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA6X1jgxAMFHc9/goAhbkSPExpvsI3zbKmObTsicdLFeyhNTaR0EywUwcNUoSkZXF4cYINy0FuS2A81gRn0KlP8p4iQ8PEZ/DTOEvQNVSxUlPXkxD/yYBVH/FdXH5UskzkdtyK/xFUxfXLNWAZyRB6S8yvpODJMskJL8cApRqrnGA==
+          </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>
+    <OrganizationName xml:lang="en">UHR</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Antagning.se - ny</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Universityadmissions.se - new</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>Universityadmissions.se</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>Universityadmissions.se</Company>
+    <SurName>Håkan Pettersson</SurName>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Universityadmissions.se</Company>
+    <SurName>UHR Systemdrift</SurName>
+    <EmailAddress>appldrift_saml@uhr.se</EmailAddress>
+    <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index dd62911e..a267f6a4 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -19,5 +19,6 @@
   <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>