1 files changed, 74 insertions, 41 deletions
diff --git a/nya-1.0/shibboleth.testc.ladok.umu.se.xml b/nya-1.0/shibboleth.testc.ladok.umu.se.xml
index 341bb3a1..e6e96b59 100644
--- a/nya-1.0/shibboleth.testc.ladok.umu.se.xml
+++ b/nya-1.0/shibboleth.testc.ladok.umu.se.xml
@@ -1,41 +1,74 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-idp">
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">studera.nu</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmeta:Scope xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0">studera.nu</shibmeta:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC/jCCAeagAwIBAgIJAMXBqFyzE+eyMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTA4MDExMTExMTg0NloXDTE4MDEwODExMTg0NlowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDuOJy8znIq+12hFWckc2W4ghjWa8ltdyM850ty7pgetqFWg5lDO0GLRJSRne9eth0xowH4h9PcBa1Y+wKV71MiU5QHX+k3nyreN+HjxJ2vki0DD0fW5D3EdpXW/bHyQZ/R5v4dgGjevgsuGNJMB2ncJhVELIe/XJZotW86r973aYVnsadEy3XuYi6mvCm60OYk44H2IC2lx9wbmfA843ckSHTU75UvWKlfIAFFuMKZzP9XNIZVeHIvSxV3fNe1hrE82Otvz5t4avLbEXnsD/GWqnlYyaJ9IQksR240fLWs+3wB9IFRZ63BnFCwVDoBpNpPEPUTKrW+RIM8OSUzvmrAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFgTPFlDaGv1rMB1ZJw6ZuNYWfAkWBnknqgp7gVFqCyhAkCAi9TxNf23Bxp6l9sVRzBKYoh5lBS14qeaivJ7A/47aOBRElo0oH3TO/3vW+lWRs+B0rVXvSYniGphXpGH9oFDx92/uqww7hTb3AuBAVqqTDfgj0HQWXoH3FKX9nBhFLeqXn1E0Zo4y2tdZKjkVIu1BVELApbmG/cuo6bnjOo20vs63j8XtEhhRoV+jVdJS8WtI/rZhxsXqBe4gzEdeahaj1HkRbLsv/6HRS1b74wvklpdZg/QaC7rup4tTCkDqW5ioeHL3eYwP0iuGkQtyxHLyX9IOuT1Lt+/TKSzC+4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testc.ladok.umu.se/shibboleth-idp/Artifact" index="1" isDefault="true"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testc.ladok.umu.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">studera.nu TestC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">studera.nu TestC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Umeå university</Company>
-    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+<EntityDescriptor entityID="https://shibboleth.testc.ladok.umu.se/shibboleth-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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.testc.ladok.umu.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://shibboleth.testc.ladok.umu.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.testc.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.testc.ladok.umu.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">studera.nu</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAM84VCwYJ66hMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGMubGFkb2sudW11LnNlMB4XDTEwMDgxMDEzNTgzMFoXDTIwMDgwNzEzNTgzMFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAq5lkmuCX5rgUfx1jea+4/PKcvup3stcuRCM3AuPZRGoZwBcz+TZ1ZkpOfbetb6gSAYuB94613roVABpEYxNKdwIDAQABo4GKMIGHMB0GA1UdDgQWBBQq6DxSjwh1/hYPdGFOOTm69EJj+TBYBgNVHSMEUTBPgBQq6DxSjwh1/hYPdGFOOTm69EJj+aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yy5sYWRvay51bXUuc2WCCQDPOFQsGCeuoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWVbUK/MAZ3dNCuwAJ4yrz6Z596BaUaIygIVMzK2yldTdeCiT0Wg2ZL0dwnixAmtnmYvNdugzjFnEVAxjTIpb+g==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.testc.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.testc.ladok.umu.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>
+    
+</EntityDescriptor>