From 64ff6e382986cd71d9e693458caa77026981d5fe Mon Sep 17 00:00:00 2001
From: Johan Berggren <jbn@klutt.se>
Date: Fri, 6 Jul 2012 10:25:17 +0200
Subject: resolves SWAMIDOPS-6580

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

diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
new file mode 100644
index 00000000..9d64549e
--- /dev/null
+++ b/swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_9458021bc8261bf7131b35132f9e5b8fc1537957" entityID="https://ladok3-00.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-00.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-00.ladok.umu.se/gui-sp</ds:KeyName>
+        <ds:KeyName>ladok3-00.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3-00.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIJANyLphmqAiCsMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwNDAyWhcNMjIw
+NjI0MTMwNDAyWjAhMR8wHQYDVQQDExZsYWRvazMtMDAubGFkb2sudW11LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4lukmN1u10uEnOWVd7LjVUjl
+9U0U4UKGSy8/zJBKqatk5E+JW6LVB9wZDx85kUPOrflBc72brXWx2x03yne06X6n
+Ywr7a1Gp2bQKyw8IuXAxoTgG6IYEWtpoFmX/IKkOwCgb9qBnaije51BKDbFz9GMy
+n7FaSy6lHm5QrzYAXJDKippsEInJYEChhjYNuFImGySYxYVkmgqXVqW7caZYOwQC
+xERDtsPJwUluO8dRbzzcmQxlhstzr0GQkAnwodtP9cCmvO2SUboNVbxNQmL4Er9D
+Vzn+EiTW1jZaYOfQi+BfLSwZt/aWPBLMg2q3voeu3u7gCyMGcdN3SoG8dEoU4QID
+AQABo2swaTBIBgNVHREEQTA/ghZsYWRvazMtMDAubGFkb2sudW11LnNlhiVodHRw
+czovL2xhZG9rMy0wMC5sYWRvay51bXUuc2UvZ3VpLXNwMB0GA1UdDgQWBBS8Q9eh
+YSdw4S9o1UfOdXlrgS5owTANBgkqhkiG9w0BAQUFAAOCAQEAM3LCbyt/tuBMlNap
+X3OCJlCz/sQOiSbDgG154z3VzXLVYM1seUjCFWwPpO7kw3hS0kvNxAEQS59eaJkD
+MIno0z+OT3OTnr30ERGZAVZ4cX79Ww2nX1mtWJN1WB9M40XeUFXGIvoVR5LckNyH
+ax8gu3I2/RzG8yS0F4fH5Kz1eDZaaSBtQV2mWkps3x4fEOvh3qFc373bUmL1Ms2g
+eWORbwxcAgGd59kxtofZzDjrx6o2qT8ELV5iD7yQteLe91Flh1/5U07EXlvJLMz3
+kqFto5NOuXUYh/srUMR0mzAVUbECgIbU7Os7gpUno65QsP8rJEdwHzig9WNLpoy0
+w5aKug==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3-00.ladok.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-00.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-00.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-00.ladok.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3-00.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-00.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-00.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
new file mode 100644
index 00000000..fbe266ba
--- /dev/null
+++ b/swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ladok3-00.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>
+MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ladok3-00.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-00.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-00.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ladok3-00.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-00.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-00.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>
+MIIBizCCATWgAwIBAgIJAPWmpqFS/L0HMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMMFmxhZG9rMy0wMC5sYWRvay51bXUuc2UwHhcNMTIwNjI2MTMwMzM3WhcNMjIwNjI0MTMwMzM3WjAhMR8wHQYDVQQDDBZsYWRvazMtMDAubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKRR5KotOWLu7l6muQ79UgiWCVnDlhlDHvP35Pr6+l+qYNYOs/7Tj3AxqVZ5VbHBcAs3Jy24FLaehvXgEJEXCUMCAwEAAaNQME4wHQYDVR0OBBYEFFpKhfUOvkIupy7lxNKwx/Z9zyAmMB8GA1UdIwQYMBaAFFpKhfUOvkIupy7lxNKwx/Z9zyAmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCIAnEcvv6+3f+bKtnTqFKwKFXtt23jyFkFyYC7wMnNiFFhzgu/AhVhT5lcokjyrIl/klOWfWQ9xjBWHCWuhiRg
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ladok3-00.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ladok3-00.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-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index cdcb42c0..7bae34a4 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -82,4 +82,5 @@
   <xi:include href="swamid-externals-2.0/elegitimation2-test.inloggning.se.xml"/>
   <xi:include href="swamid-1.0/ladok3.ladok.umu.se-user-idp.xml"/>
   <xi:include href="swamid-1.0/referens-idp.skolfederation.se.xml"/>
+  <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-user-idp.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 4be30ab3..32535670 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -267,4 +267,5 @@
   <xi:include href="swamid-1.0/test-chalmers.pingpong.net.xml"/>
   <xi:include href="swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml"/>
   <xi:include href="swamid-1.0/minastudier.ladok.umu.se.xml"/>
+  <xi:include href="swamid-1.0/ladok3-00.ladok.umu.se-gui-sp.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3