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

6 files changed, 140 insertions, 0 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index a3a515af..e154b451 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -94,6 +94,7 @@ idp2.hv.se-idp-shibboleth.xml
 idp2.kau.se-idp-shibboleth.xml
 idp3.hv.se-idp-shibboleth.xml
 idptest.test.it.gu.se-idp-shibboleth.xml
+idp.test.antagning.se-aws-idp.xml
 ilearn.dsv.su.se-shibboleth.xml
 its-pd0001.ad.umu.se-shibboleth.xml
 its-pd0030.ad.umu.se-shibboleth.xml
diff --git a/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
new file mode 100644
index 00000000..8262582f
--- /dev/null
+++ b/swamid-2.0/idp.test.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.test.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 - Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universityadmissions.se - Test</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>
+MIICDjCCAXegAwIBAgIJAPPxF5uibVyFMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0xNzA0MDcwNzM4MDZaFw0xNzA0MTIwNzM4MDZaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmNlVl77d4AiIRznH/yRqVlLtIt6ae1SdXizXwLGWnVZ80JOnfekuRGQplIuIK9rSxQICtFRQJTciRVin2R35WoQe4mdclrBxQyUARKqv2e1pX9vIFz4hZLUCALKcl//hjBAThvNv16cJwqlYPQEMj3b7yTrxVd/GIzAEazYCsvsCAwEAAaNQME4wHQYDVR0OBBYEFAe5nvFClIWjFNZ4GtvDDkYv6oClMB8GA1UdIwQYMBaAFAe5nvFClIWjFNZ4GtvDDkYv6oClMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEAVuihB7YCZ+7I8UuC8hNQc2aY+FOPILn2xFG18CUs51p8+i3gi3egRvjGqZdfG9rxCmEM+7TFQaIcY+mVgghPJHZngPEWZjTt9g+mNQnRBrldkwwoigozMcJNcllXMj7ZjumrY2oy8W9BCCJDyi1scGVybNeIsJ/iDyNaEbD8WS4=
+                    </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 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>
+MIICDjCCAXegAwIBAgIJAPPxF5uibVyFMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTAeFw0xNzA0MDcwNzM4MDZaFw0xNzA0MTIwNzM4MDZaMCAxHjAcBgNVBAMMFWlkcC50ZXN0LmFudGFnbmluZy5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmNlVl77d4AiIRznH/yRqVlLtIt6ae1SdXizXwLGWnVZ80JOnfekuRGQplIuIK9rSxQICtFRQJTciRVin2R35WoQe4mdclrBxQyUARKqv2e1pX9vIFz4hZLUCALKcl//hjBAThvNv16cJwqlYPQEMj3b7yTrxVd/GIzAEazYCsvsCAwEAAaNQME4wHQYDVR0OBBYEFAe5nvFClIWjFNZ4GtvDDkYv6oClMB8GA1UdIwQYMBaAFAe5nvFClIWjFNZ4GtvDDkYv6oClMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEAVuihB7YCZ+7I8UuC8hNQc2aY+FOPILn2xFG18CUs51p8+i3gi3egRvjGqZdfG9rxCmEM+7TFQaIcY+mVgghPJHZngPEWZjTt9g+mNQnRBrldkwwoigozMcJNcllXMj7ZjumrY2oy8W9BCCJDyi1scGVybNeIsJ/iDyNaEbD8WS4=
+                    </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>
+    <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 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-2.0/konto.bth.se-sp.xml b/swamid-2.0/konto.bth.se-sp.xml
index d36a6e64..1e838192 100644
--- a/swamid-2.0/konto.bth.se-sp.xml
+++ b/swamid-2.0/konto.bth.se-sp.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://konto.bth.se/sp">
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata: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">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
   <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
new file mode 100644
index 00000000..63206558
--- /dev/null
+++ b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://stipendier-test.its.uu.se/stipendium">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scholarship </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Stipendiehantering - (Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">System (Test) som hanterar stipendium vid Uppsala universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Scholarship (Test) management system at Uppsala university</mdui:Description>
+        <mdui:Logo height="125" width="125">https://stipendier-test.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://stipendier-test.its.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://stipendier-test.its.uu.se/stipendium/stipac/login</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDYzCCAkugAwIBAgIEfScBOzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJzZTEQMA4GA1UE
+CBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMCVVUxCzAJBgNVBAsTAklUMRUw
+EwYDVQQDEwxUb21teSBTdGVudmkwHhcNMTcwMzAzMDcwMDA3WhcNMzcwMjI2MDcwMDA3WjBiMQsw
+CQYDVQQGEwJzZTEQMA4GA1UECBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMC
+VVUxCzAJBgNVBAsTAklUMRUwEwYDVQQDEwxUb21teSBTdGVudmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCcxAvJuFC8orIPNpsam9iXZJekHs2dSmDd/ex50A0vf3l60cpkxg3cAMcR
+EH5Bk+h9PSO0eRjj7pzPFE1Ok0MQEsmCljXQPcMfOOXGAD6g+cR3ZyLqiZ7k8/oog5G+S5HFAY+4
+7y6loEkYsJ1iLTPhgBLeoWjFP2T8S67l5WSHAeeUVEyeXfodxGA4zee3w3V9XtaNc/ldiEZnF905
+dITQX4D5gew3Tb9ezP79+GrHQwv3Q3xWjU4EILJ6uGFcBhO0fbj7hS7GGvmzMgI9vyq10xVdUAY6
+kFpwwnfFiJm3gkusTvluuWnyscA3RTzrNab290jrXzHQQcP1AoeA/WdjAgMBAAGjITAfMB0GA1Ud
+DgQWBBTCDLvl0/fpImvNkS9Wsg1fZ+fu1jANBgkqhkiG9w0BAQsFAAOCAQEAHXbUQzYX7q5tE7f6
+VuU2YtI+XFOBdrw4SE1uDcd1XeWMcBsMvcEFbeWrwhYdVlv9+ni1A3/pGgy6Do9EvJfu79Jj6QgQ
+GdbL+RJ/8oBt09w+zGJ00m86g5JpN5l19CIi+yIVBGL1v+aK6c3AHC+9y8f2965mHk/YZknIw1xR
+1EXQ1/KXwlHzvBpEU3EfWRxhZ+B66zWHfekr659A3T5wCUpPWrzVCTaXh2ZNEBY95bGhuECZnVVY
+yRw902t0AGgUk9jhJ83aMPdrSk3IZTFa5YOC9OQcwJ6nfAGXNgsn/taFleA8+GaIBwhKF95s8h1J
+l+6u+L3FBjFOWmy9EQZdyA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <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:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Stenvi</md:SurName>
+    <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 04c9bbb2..37854442 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -58,4 +58,5 @@
   <xi:include href="swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/login.it.liu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 1c23518d..df736529 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -64,4 +64,5 @@
   <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-rs-sp.xml"/>
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/stipendier-test.its.uu.se-stipendium.xml"/>
 </EntitiesDescriptor>