1 files changed, 75 insertions, 33 deletions
diff --git a/nya-1.0/shibboleth.testb.antagning.se.xml b/nya-1.0/shibboleth.testb.antagning.se.xml
index d09aea17..2cf50438 100644
--- a/nya-1.0/shibboleth.testb.antagning.se.xml
+++ b/nya-1.0/shibboleth.testb.antagning.se.xml
@@ -1,35 +1,76 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.testb.antagning.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/jCCAeagAwIBAgIJAMA557kt5fw6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTA4MDYwMjEzNTM1M1oXDTE4MDUzMTEzNTM1M1owKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDixYzUCqyIpeRNhebufXLWZQoeAm8ptKAzSvW7wGVuYyvDIQn+oLskZd6km4BzapNjh5VFe0YeK39oTOywsOOvIp6ozwTRWiYeeOE69cKf3I+0ILwH9eW1xndLulPBYAxkNrbtTTktkKfmd6HItabTVSibJ6iQPoYS1gZvmZnGK4927HemQ5wW8xU2fxi+loUJctYVHWY2mTm2tJ9/MrbIUdQ63b4xTuD6+jMiIXhHteBvNjWMAA4mpcgIvF3RTehCG7SRozlVV1w/+Wwfcgfsoz1I4zc8MOoYCy6vrqvQGk2ZDCwnLUMNLaE2sg2kDtlpbMKpuIIKhxLI8ht/oR3/AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAMC9CGGJTOT/n/hocXkBhaRuK6Ik0KdjPwjnNwBhUcHWp+ADuNXZhzF6yUkEWrXkF748+5YioWg7SHb430skNUH/8v3aTYME+boW0/Ng+8BpBeLUkJE4gT4ydHwHdIht3/XmimCU3NZ/DRoyiNKP4Od1lz+jNzOiGOUcam6g3GaN8fEzwNdADBG5nnF186SSNk/D7H92nqPO3yvSW3rAOgHvYkbWtB0VgXTLF22cLweUUdxfLUHVcTxUvuP7+UwmEmouTWLgx4wneMpFD/fSJUU+wsupjblWYYJgT2vtVfORBSOLiN+9JBz8dKSTgP8DOidnj5pKTamBDngYRtwIzmw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.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/jCCAeagAwIBAgIJAMA557kt5fw6MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTA4MDYwMjEzNTM1M1oXDTE4MDUzMTEzNTM1M1owKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDixYzUCqyIpeRNhebufXLWZQoeAm8ptKAzSvW7wGVuYyvDIQn+oLskZd6km4BzapNjh5VFe0YeK39oTOywsOOvIp6ozwTRWiYeeOE69cKf3I+0ILwH9eW1xndLulPBYAxkNrbtTTktkKfmd6HItabTVSibJ6iQPoYS1gZvmZnGK4927HemQ5wW8xU2fxi+loUJctYVHWY2mTm2tJ9/MrbIUdQ63b4xTuD6+jMiIXhHteBvNjWMAA4mpcgIvF3RTehCG7SRozlVV1w/+Wwfcgfsoz1I4zc8MOoYCy6vrqvQGk2ZDCwnLUMNLaE2sg2kDtlpbMKpuIIKhxLI8ht/oR3/AgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAMC9CGGJTOT/n/hocXkBhaRuK6Ik0KdjPwjnNwBhUcHWp+ADuNXZhzF6yUkEWrXkF748+5YioWg7SHb430skNUH/8v3aTYME+boW0/Ng+8BpBeLUkJE4gT4ydHwHdIht3/XmimCU3NZ/DRoyiNKP4Od1lz+jNzOiGOUcam6g3GaN8fEzwNdADBG5nnF186SSNk/D7H92nqPO3yvSW3rAOgHvYkbWtB0VgXTLF22cLweUUdxfLUHVcTxUvuP7+UwmEmouTWLgx4wneMpFD/fSJUU+wsupjblWYYJgT2vtVfORBSOLiN+9JBz8dKSTgP8DOidnj5pKTamBDngYRtwIzmw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testb.antagning.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.testb.antagning.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
+<EntityDescriptor entityID="https://shibboleth.testb.antagning.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">testb.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAJWqRoJgmXcqMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTEwMTAyNzEzNDQyOVoXDTIwMTAyNDEzNDQyOVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxfyrahrSBb7sdinvjinMr4Cu8J6G+ThMVZaktDfVwqATG6XiaWuTH21wvzYAHGVh35LUptFttk72Trkc3uOZVwIDAQABo4GKMIGHMB0GA1UdDgQWBBSE6cVb+nKkS3wCk6JK9aNEBRk6+zBYBgNVHSMEUTBPgBSE6cVb+nKkS3wCk6JK9aNEBRk6+6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCVqkaCYJl3KjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAEeVkkCzk6/xQYJhJ5ulOhy/mItgzxQjhEigl/WZ0poCC7C/LKaAXEy8GEGpJrDKRLr7Fq03kErFeQqpruL3oRA==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.testb.antagning.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.testb.antagning.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.testb.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.testb.antagning.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">testb.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAJWqRoJgmXcqMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGIuYW50YWduaW5nLnNlMB4XDTEwMTAyNzEzNDQyOVoXDTIwMTAyNDEzNDQyOVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxfyrahrSBb7sdinvjinMr4Cu8J6G+ThMVZaktDfVwqATG6XiaWuTH21wvzYAHGVh35LUptFttk72Trkc3uOZVwIDAQABo4GKMIGHMB0GA1UdDgQWBBSE6cVb+nKkS3wCk6JK9aNEBRk6+zBYBgNVHSMEUTBPgBSE6cVb+nKkS3wCk6JK9aNEBRk6+6EspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0Yi5hbnRhZ25pbmcuc2WCCQCVqkaCYJl3KjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAEeVkkCzk6/xQYJhJ5ulOhy/mItgzxQjhEigl/WZ0poCC7C/LKaAXEy8GEGpJrDKRLr7Fq03kErFeQqpruL3oRA==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.testb.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.testb.antagning.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">studera.nu TestA</OrganizationName>
     <OrganizationDisplayName xml:lang="en">studera.nu TestA</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.studera.nu</OrganizationURL>
@@ -38,4 +79,5 @@
     <Company>Umeå university</Company>
     <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
+    
+</EntityDescriptor>