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

3 files changed, 67 insertions, 0 deletions

diff --git a/swamid-2.0/akkatest.its.uu.se.xml b/swamid-2.0/akkatest.its.uu.se.xml
new file mode 100644
index 00000000..bb590ac6
--- /dev/null
+++ b/swamid-2.0/akkatest.its.uu.se.xml
@@ -0,0 +1,33 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://akkatest.its.uu.se/Shibboleth">

+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">

+    <md:KeyDescriptor>

+      <ds:KeyInfo>

+        <ds:X509Data>

+          <ds:X509Certificate>

+MIIC8TCCAdmgAwIBAgIJAPevEDM/eL6HMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV

+BAMTDnJhbWEuaXRzLnV1LnNlMB4XDTEyMDUwNDEzMzkxM1oXDTIyMDUwMjEzMzkx

+M1owGTEXMBUGA1UEAxMOcmFtYS5pdHMudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA

+A4IBDwAwggEKAoIBAQC/JIPualV+2/W+KqnkNM0zJbiDe/bjGyZqTdpGGNZ+Fdv5

+YWfdMAazx8Q6nebRroCAhzOFD2IiwmPVnhAIGxoT60oSvkLEuROWlpcVGYBWO2ob

+UCJhuf36fNuM+M0cvyfNsszGY/RN+alDkRO4q+qBot0ZCQtxFXEKPc3XU71saW8G

+B5rlQT9bUzaPxnFg/c3I4YsGsrutjFhd346XlWrdY+Yu+kgCroyKuG4fJdEQj+Dc

+zYtnf8bCrmQkymdlVCrqiyscRgy7RTM4o6O86y8K/XKY75LPyO5eW1PwSQmhZ81M

+5GOyiTTvxigchLjs/RjXvO831wOFzHCTQR9s2r3hAgMBAAGjPDA6MBkGA1UdEQQS

+MBCCDnJhbWEuaXRzLnV1LnNlMB0GA1UdDgQWBBRq768tUOrPoWPR73il6QUeu7as

+ZDANBgkqhkiG9w0BAQUFAAOCAQEAAi9lQbbCd7UgMc6r1Ds6uBbz2mKwaGUOLE/d

+8ZM3aeE0QLI83yX5pF1cKNar9XNAGklsDtMc64/7+tmuimH7hzh5wbmXtZROlvAq

+A9sCefzcJtjKSXvg1N613W+03ZrUzmL0V9EtKEfEDKnuTqUzLMP112eBwZavOTmR

+qtKsyINwsUmnjBv5DayfcCzfUFmHyBlhe+hAMacex0k2Iy/jozNN5ciwvR4OlHwI

+blxtYGVB1uGczqhd4Vn/jIHHcW5mx6oamuRXMcuRoAIJxw8aL7s+0Gm6vNNbLIpt

++9Wlbs4JNpKbUADka9XZmieDYfcL+QjBqY7yhrIUnv/1GrLXTA==

+          </ds:X509Certificate>

+        </ds:X509Data>

+      </ds:KeyInfo>

+    </md:KeyDescriptor>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akkatest.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>

+  </md:SPSSODescriptor>

+</md:EntityDescriptor>

+

diff --git a/swamid-2.0/idp2-test.slu.se.xml b/swamid-2.0/idp2-test.slu.se.xml
new file mode 100644
index 00000000..0c1e62bd
--- /dev/null
+++ b/swamid-2.0/idp2-test.slu.se.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?><EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-test.slu.se/idp/shibboleth" 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"><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">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB

+BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz

+WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB

+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU

+vpSFSPj5GTA706faG2cdT/uEj44nCt+fJKsQ+AxqcJNjXW/tTSsfMcpmqViX1Z0Q

+lQE0ZoBDZ1KcwSFNj3fak93qBaX5sw75PSgvcrRnTnGTw1wDiKE0Ke5CKFIAhSX4

+PN7kz0LSxYT4492IK/suDJHT3qw3EIAGRSCkUDgiq7V938M9ooY1RcEmEhRh2u9Y

+l+1vd3g3znos01Y9EBxH7/8QMSUiA17D9fLdv8Q3AfjU1wVrt/ZFfojU6MJdB4/5

+EIljjyb4c6qya6EC/ncFcBzERO/qkNKaPc9oZLykR61NgLfPJcbR/kHGmoFUzwID

+AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLXRlc3Quc2x1LnNlhidodHRwczovL2lk

+cDItdGVzdC5zbHUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFqVAZevGJiv

+gszk7pbfb6vbVLwsMA0GCSqGSIb3DQEBBQUAA4IBAQCANZw9xmEFKJYgNyVAZuj7

+nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs

+oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS

+0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K

+YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc

+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/><ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.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://idp2-test.slu.se/idp/profile/Shibboleth/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-test.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/><SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-test.slu.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">slu.se</shibmd:Scope></Extensions><KeyDescriptor><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPejhcnnbj2RgPhljHfQBYe2qEWZMA0GCSqGSIb3DQEB

+BQUAMBsxGTAXBgNVBAMTEGlkcDItdGVzdC5zbHUuc2UwHhcNMTMwMzExMTUwMDEz

+WhcNMzMwMzExMTUwMDEzWjAbMRkwFwYDVQQDExBpZHAyLXRlc3Quc2x1LnNlMIIB

+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvsPOY6i0Lkm1oGdP6bBXNiaU

+vpSFSPj5GTA706faG2cdT/uEj44nCt+fJKsQ+AxqcJNjXW/tTSsfMcpmqViX1Z0Q

+lQE0ZoBDZ1KcwSFNj3fak93qBaX5sw75PSgvcrRnTnGTw1wDiKE0Ke5CKFIAhSX4

+PN7kz0LSxYT4492IK/suDJHT3qw3EIAGRSCkUDgiq7V938M9ooY1RcEmEhRh2u9Y

+l+1vd3g3znos01Y9EBxH7/8QMSUiA17D9fLdv8Q3AfjU1wVrt/ZFfojU6MJdB4/5

+EIljjyb4c6qya6EC/ncFcBzERO/qkNKaPc9oZLykR61NgLfPJcbR/kHGmoFUzwID

+AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLXRlc3Quc2x1LnNlhidodHRwczovL2lk

+cDItdGVzdC5zbHUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFqVAZevGJiv

+gszk7pbfb6vbVLwsMA0GCSqGSIb3DQEBBQUAA4IBAQCANZw9xmEFKJYgNyVAZuj7

+nbnuw/DjSfwcU7EEXCv974vUJzkIcSVk7hHu+6e7401p02b6DXUExV7CTGn5QRCs

+oiATJXOgCIQd6ZoK8KxHKn/QhgL0qfKMS51Ct5W+MMaSAl6s6mSjNibcDEsSA2JS

+0+dQWI60koi7B2U5ToLnMXHKvu1mKeFCENh6/B0h6xQkSNYI6bLIsbBe8x9ukW9K

+YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc

+6LuOz5eqy6nOAbVhtUn5GG0AdPsPNjafmMB3dc9MqIpMItErBERy4IcNl4YexZa6</ds:X509Certificate></ds:X509Data></ds:KeyInfo></KeyDescriptor><AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-test.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/><AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-test.slu.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 xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationName><OrganizationDisplayName xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName><OrganizationURL xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="en">http://www.slu.se/en/</OrganizationURL></Organization><ContactPerson contactType="technical" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Pia Skotare</GivenName><EmailAddress>mailto:pia.skotare@gmail.com</EmailAddress></ContactPerson><ContactPerson contactType="administrative" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Bo Sarling</GivenName><EmailAddress>mailto:bo.sarling@slu.se</EmailAddress></ContactPerson><ContactPerson contactType="support" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><GivenName>Help Desk</GivenName><EmailAddress>mailto:IT-stod@slu.se</EmailAddress></ContactPerson></EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index e2e67725..eb09952f 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -137,4 +137,5 @@
   <xi:include href="swamid-1.0/bhb-00.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/idp-test.nordu.net-ssp-idp.xml"/>
   <xi:include href="swamid-1.0/ecsidp.testa.antagning.se-ecs-idp.xml"/>
+  <xi:include href="swamid-2.0/idp2-test.slu.se.xml"/>
 </EntitiesDescriptor>