resolves SWAMIDOPS-6167

1 files changed, 74 insertions, 41 deletions

diff --git a/nya-1.0/shibboleth.testa.antagning.se.xml b/nya-1.0/shibboleth.testa.antagning.se.xml
index 7b5d2168..89210223 100644
--- a/nya-1.0/shibboleth.testa.antagning.se.xml
+++ b/nya-1.0/shibboleth.testa.antagning.se.xml
@@ -1,41 +1,74 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.testa.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/jCCAeagAwIBAgIJAJ0usMwrPGCEMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTA4MDYwMjEzNTM1MFoXDTE4MDUzMTEzNTM1MFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDESq5k+/aaKJ7XEKAVbwdES41sd0JoGY9cXumKQwRPo1vzq0BNY1pdip6H/l0HUkrqgZOG34aTm/jatccNCWTOycja/BCg/Qwx3YACjmqP1P5j9EE6a/3LHjBypaS1Q5Bka2Ox6mu667E4n739eNMeLmMWNleG9GzYWWHrQpBMGqkBJ5V5hhCCMVKzTd+N0NMevsvBhki3/uE3fCJ2WRUTHECMHMI38va/6/PfBZHJ6U4MIMhYis9MSLuVG7yG/VSMBztZsIdA10/Toq9YvwDxr+KxnOdGP+QambDG5ZcstAcodp1VuLC+ite/9cNsotjzfIr0u9I1jUWrmPMOrLoxAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFMfYDcC/5ZGYxYiwTpZPRu78qQjKVGk/jLen3a8I5NeLsLTpfxVzyc0UIBEtB2/7SSKLE91wRq1BnKtm3adtf5srvhU2qJF53Hl0gc7IxaxBAGGb9CdNd4oHFuTOEIrJFzQE93+NomLoliOJQsNEbh2kWKlR3loYxgtLHwzIINDSq3xdZlTdttLgj3G3cqy8NhMs6p3PjF6R2Cshiy4vGb2WY7SrUJ2WTsXCKQ4JRWBi+rYVisJezV3KLtrGGgZL3ERbTv34w4uH7rXkMEXlUF8AwvkSK3W6nBRt25xAntSvoKQYnkhBIBUbm8kcbhauK4NvuWNuNZzu+wxAz9RoW4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.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/jCCAeagAwIBAgIJAJ0usMwrPGCEMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTA4MDYwMjEzNTM1MFoXDTE4MDUzMTEzNTM1MFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDESq5k+/aaKJ7XEKAVbwdES41sd0JoGY9cXumKQwRPo1vzq0BNY1pdip6H/l0HUkrqgZOG34aTm/jatccNCWTOycja/BCg/Qwx3YACjmqP1P5j9EE6a/3LHjBypaS1Q5Bka2Ox6mu667E4n739eNMeLmMWNleG9GzYWWHrQpBMGqkBJ5V5hhCCMVKzTd+N0NMevsvBhki3/uE3fCJ2WRUTHECMHMI38va/6/PfBZHJ6U4MIMhYis9MSLuVG7yG/VSMBztZsIdA10/Toq9YvwDxr+KxnOdGP+QambDG5ZcstAcodp1VuLC+ite/9cNsotjzfIr0u9I1jUWrmPMOrLoxAgMBAAGjKzApMCcGA1UdJQQgMB4GCCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwQwDQYJKoZIhvcNAQEFBQADggEBAFMfYDcC/5ZGYxYiwTpZPRu78qQjKVGk/jLen3a8I5NeLsLTpfxVzyc0UIBEtB2/7SSKLE91wRq1BnKtm3adtf5srvhU2qJF53Hl0gc7IxaxBAGGb9CdNd4oHFuTOEIrJFzQE93+NomLoliOJQsNEbh2kWKlR3loYxgtLHwzIINDSq3xdZlTdttLgj3G3cqy8NhMs6p3PjF6R2Cshiy4vGb2WY7SrUJ2WTsXCKQ4JRWBi+rYVisJezV3KLtrGGgZL3ERbTv34w4uH7rXkMEXlUF8AwvkSK3W6nBRt25xAntSvoKQYnkhBIBUbm8kcbhauK4NvuWNuNZzu+wxAz9RoW4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testa.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.testa.antagning.se/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <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>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Umeå university</Company>
-    <EmailAddress>fredrik.aslund@ladok.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+<EntityDescriptor entityID="https://shibboleth.testa.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">testa.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAMyW2nmo1EmXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTEwMTExMTE1MjAzN1oXDTIwMTEwODE1MjAzN1owKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt98icUY4eXSIcBt2v6iLldYva1tk0iMLO6dy6YT0vg1xEbzH+Vd9fVOBsVwxrkdh4QRov/BX212GFl+s7TvY/wIDAQABo4GKMIGHMB0GA1UdDgQWBBRtuhPAJGI/4p/67ABPKVEoxUSc/TBYBgNVHSMEUTBPgBRtuhPAJGI/4p/67ABPKVEoxUSc/aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDMltp5qNRJlzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EATmauTWBy9gVCA3Hn5wVwkQ2Mzwyjkh90NRJbRiNg46sjDE89JrA1HZEa/cvbWsEa5zFPcszArjzWXs9tPZCctg==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.testa.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.testa.antagning.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.testa.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">testa.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAMyW2nmo1EmXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTEwMTExMTE1MjAzN1oXDTIwMTEwODE1MjAzN1owKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAt98icUY4eXSIcBt2v6iLldYva1tk0iMLO6dy6YT0vg1xEbzH+Vd9fVOBsVwxrkdh4QRov/BX212GFl+s7TvY/wIDAQABo4GKMIGHMB0GA1UdDgQWBBRtuhPAJGI/4p/67ABPKVEoxUSc/TBYBgNVHSMEUTBPgBRtuhPAJGI/4p/67ABPKVEoxUSc/aEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDMltp5qNRJlzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EATmauTWBy9gVCA3Hn5wVwkQ2Mzwyjkh90NRJbRiNg46sjDE89JrA1HZEa/cvbWsEa5zFPcszArjzWXs9tPZCctg==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.testa.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>
+    
+</EntityDescriptor>