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

5 files changed, 112 insertions, 6 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 18bd32f3..7f6d44cf 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -35,7 +35,6 @@
   <xi:include href="swamid-1.0/www.cambro.umu.se.xml"/>
   <xi:include href="swamid-1.0/cambro-utv1.umdc.umu.se.xml"/>
   <xi:include href="swamid-1.0/idp.umu.se-saml2.xml"/>
-  <xi:include href="swamid-1.0/idp.umu.se-saml1.xml"/>
   <xi:include href="swamid-1.0/kurser.math.su.se.xml"/>
   <xi:include href="swamid-1.0/kurser3.math.su.se.xml"/>
   <xi:include href="swamid-1.0/webwork.math.su.se.xml"/>
diff --git a/swamid-1.0/idp-test.kau.se.xml b/swamid-1.0/idp-test.kau.se.xml
new file mode 100644
index 00000000..2868cdee
--- /dev/null
+++ b/swamid-1.0/idp-test.kau.se.xml
@@ -0,0 +1,106 @@
+<?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.kau.se/idp/shibboleth">
+
+    <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">kau.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
+Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVDJpZBV5iqqcHOdf1x30M7vK7n
+B2ZPL86g8JDb16CeH5FHnA9neydqunpY3qX4/NJjuIglsmvDVh1ZPpQFSEOsA4YM
+p1hmSKuCc2k6YhTRnnvrno12v7a10RZyVRD952cQLLlYz0/AAZoVfvILgnVX2QQF
+VXzE4H1OpsTQIuSriuHh8+IdEuwZ2RlZfnsbpiAkVj2X0i1K7DhC3GHXgiN/UAps
+a3nFE9j2m1IewnL0/xO0VNf07nA83c7vvR3Ekua6UeqjA8zsgrQSSbuFiZcWn4dF
+6BNqkr9Q96G5A72/jvI+rluuu/QJ7G+CuHgAhRS6VKrynR4NdCMIxOeu5usCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10
+ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2vqi7u/v5R4V2Ejb
+1CtC/Nt6vhAwDQYJKoZIhvcNAQEFBQADggEBAG+1OjFI0WzKL0vhoO+OAXgT/5nA
+oUYST3WkNqx1W+EobtjQnJfI5csi3XSRYvoHEuFZqKQL4Wfrzs2lBGvOi57F9UdQ
+cc7EM6tBU+r22/AxUmBWDFLVoB4uStPNT8LBRcB75jAbHHdny6r/KxeRcqU1ug/3
+uv2QZfazpP7UtGpYSX27MsrT0ASyVchSta8kbWV8m7dyziJ4alAPYMBM4+qEic98
+MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
+Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.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.kau.se/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.kau.se/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.kau.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">kau.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAL6+eYiH7vM1UZL2/N2xPdb4piT6MA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTAeFw0xMTEyMTQyMTAzMTVa
+Fw0zMTEyMTQyMTAzMTVaMBoxGDAWBgNVBAMTD2lkcC10ZXN0LmthdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVDJpZBV5iqqcHOdf1x30M7vK7n
+B2ZPL86g8JDb16CeH5FHnA9neydqunpY3qX4/NJjuIglsmvDVh1ZPpQFSEOsA4YM
+p1hmSKuCc2k6YhTRnnvrno12v7a10RZyVRD952cQLLlYz0/AAZoVfvILgnVX2QQF
+VXzE4H1OpsTQIuSriuHh8+IdEuwZ2RlZfnsbpiAkVj2X0i1K7DhC3GHXgiN/UAps
+a3nFE9j2m1IewnL0/xO0VNf07nA83c7vvR3Ekua6UeqjA8zsgrQSSbuFiZcWn4dF
+6BNqkr9Q96G5A72/jvI+rluuu/QJ7G+CuHgAhRS6VKrynR4NdCMIxOeu5usCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLXRlc3Qua2F1LnNlhiZodHRwczovL2lkcC10
+ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2vqi7u/v5R4V2Ejb
+1CtC/Nt6vhAwDQYJKoZIhvcNAQEFBQADggEBAG+1OjFI0WzKL0vhoO+OAXgT/5nA
+oUYST3WkNqx1W+EobtjQnJfI5csi3XSRYvoHEuFZqKQL4Wfrzs2lBGvOi57F9UdQ
+cc7EM6tBU+r22/AxUmBWDFLVoB4uStPNT8LBRcB75jAbHHdny6r/KxeRcqU1ug/3
+uv2QZfazpP7UtGpYSX27MsrT0ASyVchSta8kbWV8m7dyziJ4alAPYMBM4+qEic98
+MCUrqCvl40nvl7TfesM/0VOgrPiGi4fNt+hF5cPPVMUGC2buM8Ox2rsqg9Tr8klP
+Tnia5JUcHU+5FI4AguTUeFr5F8YbByd7KBjsN6ywpK7ulrrNJnDzWFmSCYY=
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.kau.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">KAUTEST</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Karlstad university (Test IdP)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>KAU</Company>
+    <EmailAddress>paul.scott@kau.se</EmailAddress>
+  </ContactPerson>
+
+
+</EntityDescriptor>
diff --git a/swamid-1.0/idp.umu.se-saml1.xml b/swamid-1.0/idp.umu.se-saml1.xml
index fc35887a..e8b61e4e 100644
--- a/swamid-1.0/idp.umu.se-saml1.xml
+++ b/swamid-1.0/idp.umu.se-saml1.xml
@@ -21,8 +21,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML1)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML1)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-1.0/idp.umu.se-saml2.xml b/swamid-1.0/idp.umu.se-saml2.xml
index 71e43a42..1bd6b6a6 100644
--- a/swamid-1.0/idp.umu.se-saml2.xml
+++ b/swamid-1.0/idp.umu.se-saml2.xml
@@ -26,8 +26,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="se">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University (SAML2)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet (SAML2)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Ume&#xE5; University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="se">Ume&#xE5; universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="se">http://www.umu.se</md:OrganizationURL>
   </md:Organization>
@@ -35,4 +35,4 @@
     <md:SurName>Datordrift</md:SurName>
     <md:EmailAddress>datordrift@umdac.umu.se</md:EmailAddress>
   </md:ContactPerson>
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 8ea71fe3..33aba260 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -77,4 +77,5 @@
   <xi:include href="swamid-1.0/shib-idp-1.oru.se.xml"/>
   <xi:include href="swamid-1.0/dwidp.testb.antagning.se-dw-idp.xml"/>
   <xi:include href="swamid-1.0/shibboleth.testb.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/idp-test.kau.se.xml"/>
 </EntitiesDescriptor>