resolves SWAMIDOPS-6550

4 files changed, 127 insertions, 0 deletions

diff --git a/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml b/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml
new file mode 100644
index 00000000..ec2f135d
--- /dev/null
+++ b/swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml
@@ -0,0 +1,51 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ladok3.ladok.umu.se/gui-httpd">
+
+  <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.ladok.umu.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://ladok3.ladok.umu.se/gui-httpd</ds:KeyName>
+        <ds:KeyName>ladok3.ladok.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ladok3.ladok.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIJAO+nGfYfHSo0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwMTE4WhcNMjIwNTE5
+MTUwMTE4WjAeMRwwGgYDVQQDExNsYWRvazMubGFkb2sudW11LnNlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwmMN9JjN0RKJdh1mh6vUBjywQlC82JJ8
+UBhiJQ6zNOvNuMF2JcuwFdCsqx3z18E0PiOcpvwAvIHH0KLkuoqKc/UomJwFuEdk
+JEVjeWBdc6W5hNuC0OiHOd5M07sb0zFk+jf52rk3UuSo9Ubse9L5zoOLHJEf6Vlh
+1wu7Zv8yUkOk94ZCYzHO4RO1ZfFflQC8dyBNceJRYRRpCnq1VJy1J8SgHV96V1Tq
+2bO/hYBIhwd25ofRL+W7cl4HEf0cWUOXVDLvT0xE/2R6z/wBqD7x1Pw+RdwqS9RX
+HpQtw69pKTH3DWu0QWzH1EvNUE5Ke5qkUNq4/Okvzf/K9GzgxdvLzwIDAQABo2gw
+ZjBFBgNVHREEPjA8ghNsYWRvazMubGFkb2sudW11LnNlhiVodHRwczovL2xhZG9r
+My5sYWRvay51bXUuc2UvZ3VpLWh0dHBkMB0GA1UdDgQWBBRNSJMJDSu63CGSQuaN
+3TwINtU58TANBgkqhkiG9w0BAQUFAAOCAQEAkC7vpVsFZc3dSI7/CnFnG3twZZYl
+f3BxeSjsOO9LKJj0u/1hPVJ8qr+kj1qBSkczIyWlukODaxioEVeSyg0oDJxSR/Vb
+V/QeFI6VBVdDO+50wLQ1kCVA1UB6Z6I0X3K9ShrH4+4pHeyEHnsMwnY7OreWX8cT
+6w3oZW0wGZAcaaJjmjPYc6TYw/I0NOQFRHb0xz8PoLjOkAo4XIgrEfB3qa6wMxy4
+KLgWWs0w9Aop3/hPClDX5qdmhUbjr32CRGW6eIxpe9nCXA/+Mz+w7wSlzifX0Cu3
+78dYC4kSnI2mX2yhEGoGZEEND6D24Pkt2niikITmAKJVotkJk9ahoKj7YA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.ladok.umu.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml b/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml
new file mode 100644
index 00000000..24a6256c
--- /dev/null
+++ b/swamid-1.0/ladok3.ladok.umu.se-user-idp.xml
@@ -0,0 +1,74 @@
+<EntityDescriptor entityID="https://ladok3.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>
+MIIBhTCCAS+gAwIBAgIJANsWgJWyj/bKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMME2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwNDM1WhcNMjIwNTE5MTUwNDM1WjAeMRwwGgYDVQQDDBNsYWRvazMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMNkxc/qnIuD3zwF7ePTTn+n0KYSi2dEho4oULnsnbskSIwlj6iPsQyjaCdZcI1uinwNAnIjMmGj0JgzmEiIZtsCAwEAAaNQME4wHQYDVR0OBBYEFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMB8GA1UdIwQYMBaAFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCrw4ghUKcp7dxe1KZX14ZOvIuKd/lxtohDZhaY1yiDVokT5hPjTJNWozaVmsOLTctZUkTkBRv9sTlM4+5CVVOv
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://ladok3.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.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.ladok.umu.se:8444/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://ladok3.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.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.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>
+MIIBhTCCAS+gAwIBAgIJANsWgJWyj/bKMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMME2xhZG9rMy5sYWRvay51bXUuc2UwHhcNMTIwNTIxMTUwNDM1WhcNMjIwNTE5MTUwNDM1WjAeMRwwGgYDVQQDDBNsYWRvazMubGFkb2sudW11LnNlMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMNkxc/qnIuD3zwF7ePTTn+n0KYSi2dEho4oULnsnbskSIwlj6iPsQyjaCdZcI1uinwNAnIjMmGj0JgzmEiIZtsCAwEAAaNQME4wHQYDVR0OBBYEFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMB8GA1UdIwQYMBaAFCrhVGgs2M86Ew4oqWxb6TJ/KUWGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQCrw4ghUKcp7dxe1KZX14ZOvIuKd/lxtohDZhaY1yiDVokT5hPjTJNWozaVmsOLTctZUkTkBRv9sTlM4+5CVVOv
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://ladok3.ladok.umu.se:8445/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://ladok3.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 678f7daf..24ee3f5a 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -80,4 +80,5 @@
   <xi:include href="swamid-1.0/idp-test.kau.se.xml"/>
   <xi:include href="swamid-2.0/box-idp.sunet.se-idp.xml"/>
   <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"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index c063c3c2..a017e077 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -265,4 +265,5 @@
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-ecs-sp.xml"/>
   <xi:include href="swamid-1.0/nya-50.ladok.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-1.0/test-chalmers.pingpong.net.xml"/>
+  <xi:include href="swamid-1.0/ladok3.ladok.umu.se-gui-httpd.xml"/>
 </EntitiesDescriptor>