From 71079c110aa36f52c689d90e746d2f3ea7edf5bd Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 5 Oct 2012 09:48:47 +0200
Subject: resolves SWAMIDOPS-6654

---
 swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml   | 53 ++++++++++++++++++
 swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml | 74 +++++++++++++++++++++++++
 swamid-testing-sp-1.0.mxml                      |  2 +
 3 files changed, 129 insertions(+)
 create mode 100644 swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
 create mode 100644 swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml

diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..488e9eb7
--- /dev/null
+++ b/swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_8cd81bfe55d198f0bf292f512a2fc59f33a57f74" entityID="https://ladok3-p00.ladok.umu.se/gui-sp">
+
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3-p00.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-p00.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-p00.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJALrB0xU/Xw/gMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOFoXDTIy
+MDkyOTExMzIyOFowIjEgMB4GA1UEAxMXbGFkb2szLXAwMC5sYWRvay51bXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpbAeLhpRp3k4YRgZev5r0
+H0Qp5DJT2GFGwG0u2rKGx8PRQH9VEcQs+hwoWjRf+ubNgkGRfQlg76FaIg5WLxf3
+orhS1rPRGvLWOocBwq+w9pSLQBSL6NXI0MyQtXx1zTrruPC0Ps5gZ9dxinLg42al
+8Z43IOJpzlxV/og1sk/54r/mRYWr8EO2WZc/m6PkUK5/tJVf2fW5y/uXp9lEd8G3
+SzWicsN5QPnQyjoNUArtJOtdqGraP8Z+f/abB1a0vMoBZIwNj+2/6uC0tVvEE+hQ
+qcVm7KBafsaZnsNNDw847NY7062NiqSotc4k10O9d46lh1l6DUWBVwT1SaJqdFPt
+AgMBAAGjbTBrMEoGA1UdEQRDMEGCF2xhZG9rMy1wMDAubGFkb2sudW11LnNlhiZo
+dHRwczovL2xhZG9rMy1wMDAubGFkb2sudW11LnNlL2d1aS1zcDAdBgNVHQ4EFgQU
+jIZiZRgSHi+Tg9++uEVPoqO0PnIwDQYJKoZIhvcNAQEFBQADggEBAGo8rWUyUsFE
+RnG4ja0Jr6CvmUCDEE8Hf2NR9X2pArHz4jZPN8Y+DJQxXA9z2f3tZyV16gRisz2n
+RyO30vCBYEeoblggXnrpJCHntSTXq+4wGT2nsXQf+OCELx4Fpge0EyHtruZcre+F
+4BT/hr1Zv/bgWYgK3HrD/a7Viez16powiAsO5ScHyXr0ayrwgI/y1v/HdK8jonpz
+Es66FG7elAYpYzzuiIlFApPK7+Bqc/AMklmzVWfB2+XQxnkKQ7B69NvuYldtUChv
+v0hYJMxInGifhVs86hcWvWCc9Cv65UAVGTvCW2KdtFe8n7xuux3KljOXlv8ECcLZ
+vt1mkOs1sbw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-p00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
new file mode 100644
index 00000000..cfbbf18e
--- /dev/null
+++ b/swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ladok3-p00.ladok.umu.se/user-idp"
+                  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">
+
+    <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">ladok3.ladok.umu.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://ladok3-p00.ladok.umu.se:8445/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://ladok3-p00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://ladok3-p00.ladok.umu.se:8444/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://ladok3-p00.ladok.umu.se:8444/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">ladok3.ladok.umu.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBjTCCATegAwIBAgIJANXpKwXKmM24MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNVBAMMF2xhZG9rMy1wMDAubGFkb2sudW11LnNlMB4XDTEyMTAwMTExMzIyOVoXDTIyMDkyOTExMzIyOVowIjEgMB4GA1UEAwwXbGFkb2szLXAwMC5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAowQxKkq7Lom51gN/EVw3s9O+uINyhh4jGtGz3enyFbwvHrGqWPuL7wtRjCN6tc/bYk2oLGRJgDE9nRCZKema/QIDAQABo1AwTjAdBgNVHQ4EFgQUw52OrLNysL3wdCMbtuKG18Yd+PIwHwYDVR0jBBgwFoAUw52OrLNysL3wdCMbtuKG18Yd+PIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAANBAGkUTal4Z+7/W36AJbqqoVACclN8exDtfpqAJIClRl22WtB1bkQkxBRD38yrcHop3/F39KPSFlfttDQYbeqxRzs=
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ladok3-p00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ladok3-p00.ladok.umu.se:8445/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>
+    
+</EntityDescriptor>    
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 9dc14d8e..d27f04df 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -291,4 +291,6 @@
   <xi:include href="swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-1.0/nidev-consumer.nordu.net.xml"/>
   <xi:include href="swamid-1.0/ladok3test.its.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-1.0/ladok3-p00.ladok.umu.se-gui-sp.xml"/>
+  <xi:include href="swamid-1.0/ladok3-p00.ladok.umu.se-user-idp.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3