resolves swamidops-6338

5 files changed, 243 insertions, 61 deletions

diff --git a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml b/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
index 5caf85f0..7eba09c6 100644
--- a/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
+++ b/swamid-1.0/dwidp.testa.antagning.se-dw-idp.xml
@@ -1,75 +1,74 @@
-<EntityDescriptor entityID="https://dwidp.testa.antagning.se/dw-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> 
-MIIBxTCCAW+gAwIBAgIJANHWTR7B1cnZMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMDEyMDYwOTE2MjZaFw0yMDEyMDMwOTE2MjZaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDr7tEWuSy1ebbRPZlhsT2kkC12QyM1l70EQaSIbRvub2Imx2u0gYx1TbLe/gL4EbjQCtbM/vQi3dQmSfI9GsgLAgMBAAGjgYUwgYIwHQYDVR0OBBYEFE7WqKGb0GHpfVPsbiM86TIcz/aMMFMGA1UdIwRMMEqAFE7WqKGb0GHpfVPsbiM86TIcz/aMoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDR1k0ewdXJ2TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACsdC0u+BNcXq9BWGEjDoJgTaWBaZE/av++tc8kdQXUHsMM5E0cRZ/aQ8R/Pu/3EvocnolZpMlhKl839e5iwW6w==
-                    </ds:X509Certificate> 
-                </ds:X509Data> 
-            </ds:KeyInfo> 
-        </KeyDescriptor> 
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+<EntityDescriptor entityID="https://dwidp.testa.antagning.se/dw-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">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
                                    Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/> 
+                                   index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" 
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                                    Location="https://dwidp.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> 
+                                   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://dwidp.testa.antagning.se/idp/profile/Shibboleth/SSO" /> 
-
+                             Location="https://dwidp.testa.antagning.se/idp/profile/Shibboleth/SSO" />
+        
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST/SSO" /> 
+                             Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST/SSO" />
 
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" /> 
-
+                             Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
         <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://dwidp.testa.antagning.se/idp/profile/SAML2/Redirect/SSO" /> 
-    </IDPSSODescriptor> 
+                             Location="https://dwidp.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"> 
+    <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> 
+        <Extensions>
+            <shibmd:Scope regexp="false">dwidp.antagning.se</shibmd:Scope>
+        </Extensions>
 
-        <KeyDescriptor> 
-            <ds:KeyInfo> 
-                <ds:X509Data> 
-                    <ds:X509Certificate> 
-MIIBxTCCAW+gAwIBAgIJANHWTR7B1cnZMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMDEyMDYwOTE2MjZaFw0yMDEyMDMwOTE2MjZaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDr7tEWuSy1ebbRPZlhsT2kkC12QyM1l70EQaSIbRvub2Imx2u0gYx1TbLe/gL4EbjQCtbM/vQi3dQmSfI9GsgLAgMBAAGjgYUwgYIwHQYDVR0OBBYEFE7WqKGb0GHpfVPsbiM86TIcz/aMMFMGA1UdIwRMMEqAFE7WqKGb0GHpfVPsbiM86TIcz/aMoSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDR1k0ewdXJ2TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EACsdC0u+BNcXq9BWGEjDoJgTaWBaZE/av++tc8kdQXUHsMM5E0cRZ/aQ8R/Pu/3EvocnolZpMlhKl839e5iwW6w==
-                    </ds:X509Certificate> 
-                </ds:X509Data> 
-            </ds:KeyInfo> 
-        </KeyDescriptor> 
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIBxTCCAW+gAwIBAgIJALQfyxnxGcIlMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTAeFw0xMTExMDMxNTIwNTJaFw0yMTEwMzExNTIwNTJaMCMxITAfBgNVBAMTGGR3aWRwLnRlc3RhLmFudGFnbmluZy5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDj3otRX9M3nNqyzlP3WYLM1YDP3NNJfrecwHD0zxG+Ft27z57KSK5ReMXJe563Gv88MUYP7xXuxZrYYYZMfjLhAgMBAAGjgYUwgYIwHQYDVR0OBBYEFD5/eg5m7hEbBTQjGM4VVhAer70vMFMGA1UdIwRMMEqAFD5/eg5m7hEbBTQjGM4VVhAer70voSekJTAjMSEwHwYDVQQDExhkd2lkcC50ZXN0YS5hbnRhZ25pbmcuc2WCCQC0H8sZ8RnCJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAj0sRR5pI/THUnP4Ywnfl9mjQ6BMu5nJG4m3zHaRj3wkeGhNRFgHDHk2YQtMqOMjC3PwarQgIl7cRLYPFhyiP+g==
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
 
         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" /> 
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" 
-                          Location="https://dwidp.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> 
-
+                          Location="https://dwidp.testa.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://dwidp.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>    
diff --git a/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
new file mode 100644
index 00000000..97b289ed
--- /dev/null
+++ b/swamid-1.0/expert.testa.antagning.se-ecs-sp.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_129f431101c131be3b6ec9c3049a07920a304c6d" entityID="https://expert.testa.antagning.se/ecs-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://expert.testa.antagning.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.testa.antagning.se/ecs-sp/ecs-sp</ds:KeyName>
+        <ds:KeyName>www.testa.antagning.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.testa.antagning.se/ecs-sp</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJAN9+3w1NvcgcMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXd3dy50ZXN0YS5hbnRhZ25pbmcuc2UvZWNzLXNwMB4XDTExMTEwMzEzMTQ1
+NVoXDTIxMTAzMTEzMTQ1NVowKDEmMCQGA1UEAxMdd3d3LnRlc3RhLmFudGFnbmlu
+Zy5zZS9lY3Mtc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF7h+p
+lY+XKnA9Fpo9hWxEadSxDIrehClAuix4Sq9jqaOXJSnFLsoKkuXUPOeifRKliN1M
+1OAUBzSkmLsU9pmQLGPePhsibeZ2QzRmvvRwtRnFQz/v6XqBa9aBuANeiXlSbiGD
+NQcf2DhU2Ecf172x4HxAhUzTXpgRBTJMaY2AIQHLiW+qjNWd5aBrDeLzSO1M4+AW
+2Dxb1q+UHFwQCRapZiAetaRFiAYj7+riHXv+QimWr07BIYuzxxGjYp6UxZtC081f
+A+59xZlhvELu/NILFCOxK0AV5ekjo1CWE4M3gLG8ElXksPHw9h92IbFA+XxII4yl
+bo2BRjrjxeq6hOFBAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy50ZXN0YS5hbnRh
+Z25pbmcuc2UvZWNzLXNwhixodHRwczovL3d3dy50ZXN0YS5hbnRhZ25pbmcuc2Uv
+ZWNzLXNwL2Vjcy1zcDAdBgNVHQ4EFgQUYydACh1g3sJY0QqJpPm6Aes14AgwDQYJ
+KoZIhvcNAQEFBQADggEBABgXRYqiJggINk9GwoDrmHDFFJsZkolVggcxGXajm21J
+L7lmQ/egl0wMh4b94XWt6LhSH14C/EVQ7biakVwtqNvSoNEpLNcHb2CXKlD3zI+N
+Jz+BWFQmKIob2Mz4Jq7zvz6FRRM4I8OPJgL2n9DxkjtvPdQxKEU8J8CQbm18O+T9
+BJxep5toe7CwjX6G7w8/nvyAJhbF2Y8JEbhdE87k6lOY9w3gfePPsCFZaxHIsxJ1
+l4ZGva1/3LErE+yBLMlq0btsJ3xN1WH0GndIDbKBEUybliI0YthExktB854JHFXG
+KpzNWnJjueWGyd3A1bNfLKm5zayFB1wNyPe5uKnSX5Q=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
new file mode 100644
index 00000000..8f353727
--- /dev/null
+++ b/swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml
@@ -0,0 +1,74 @@
+<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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAMIR1Ljs4a0PMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTExMTEwMzE0NTcxNFoXDTIxMTAzMTE0NTcxNFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxBH6u5C9rgTOIq9QVn8F0Kq5sKCZk6izfhINt8Im6gwikmm2DhGCWIXOnclgcoefMgHKJ2Fawij9NQugvujNvQIDAQABo4GKMIGHMB0GA1UdDgQWBBSyFqBSSvr1ZG0mNrLnlN22o5gsETBYBgNVHSMEUTBPgBSyFqBSSvr1ZG0mNrLnlN22o5gsEaEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDCEdS47OGtDzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAMx8EuFqMVguVbA2tlwlwCAqijAcgpQ4cqdLvg1U3QmjASn/3WR/4pzvfSWWBMx1Z+ITZyBM2B+oP/wwI1DlKLA==
+                    </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">antagning.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIB1DCCAX6gAwIBAgIJAMIR1Ljs4a0PMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgudGVzdGEuYW50YWduaW5nLnNlMB4XDTExMTEwMzE0NTcxNFoXDTIxMTAzMTE0NTcxNFowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxBH6u5C9rgTOIq9QVn8F0Kq5sKCZk6izfhINt8Im6gwikmm2DhGCWIXOnclgcoefMgHKJ2Fawij9NQugvujNvQIDAQABo4GKMIGHMB0GA1UdDgQWBBSyFqBSSvr1ZG0mNrLnlN22o5gsETBYBgNVHSMEUTBPgBSyFqBSSvr1ZG0mNrLnlN22o5gsEaEspCowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC50ZXN0YS5hbnRhZ25pbmcuc2WCCQDCEdS47OGtDzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAMx8EuFqMVguVbA2tlwlwCAqijAcgpQ4cqdLvg1U3QmjASn/3WR/4pzvfSWWBMx1Z+ITZyBM2B+oP/wwI1DlKLA==
+                    </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>    
diff --git a/swamid-1.0/www.testa.antagning.se-aws-sp.xml b/swamid-1.0/www.testa.antagning.se-aws-sp.xml
new file mode 100644
index 00000000..7bd08687
--- /dev/null
+++ b/swamid-1.0/www.testa.antagning.se-aws-sp.xml
@@ -0,0 +1,53 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_dca69462ce1e494f715365e919142ced8737129e" entityID="https://www.testa.antagning.se/aws-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://www.testa.antagning.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www.testa.antagning.se/aws-sp/aws-sp</ds:KeyName>
+        <ds:KeyName>www.testa.antagning.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.testa.antagning.se/aws-sp</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDTDCCAjSgAwIBAgIJALhHdWlTdPORMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXd3dy50ZXN0YS5hbnRhZ25pbmcuc2UvYXdzLXNwMB4XDTExMTEwMzEzMTQw
+M1oXDTIxMTAzMTEzMTQwM1owKDEmMCQGA1UEAxMdd3d3LnRlc3RhLmFudGFnbmlu
+Zy5zZS9hd3Mtc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvjfZK
+UCha0m0sDBe9pVL/YY9gbWAspd363rlCEaFyY481s2lYX8gXPgC/bFD8WT7XAKxa
+tYjX3ju6q4Jw/ZKdwnd3u3V9uVWSgwmc8BGAdV/WP2y5mSU9EJyTPWWBTqK50wPm
+CnTrLZqoAsWIywR5R9xusYZf8IjeOSv9ojF9yvp5+m6teGLbN8j0/CRg2SCyQkmi
+tW+QZgkwbGz8X6hvMDoOR8ViNBEZFHPDoGJvyl0SowAUvGCQ12YR8wfXBB59juFL
+E+33WgyWEEfFc+skHA0LRsHvzyQ33wRHi7wMTaSu6WlxG7lzgxzfKzJpS6RoGwmP
+sGFRskXDDYavCR4xAgMBAAGjeTB3MFYGA1UdEQRPME2CHXd3dy50ZXN0YS5hbnRh
+Z25pbmcuc2UvYXdzLXNwhixodHRwczovL3d3dy50ZXN0YS5hbnRhZ25pbmcuc2Uv
+YXdzLXNwL2F3cy1zcDAdBgNVHQ4EFgQUZ+hrnqVNJLbnEvnckP4Q9y2XDOUwDQYJ
+KoZIhvcNAQEFBQADggEBAOZaSI+yZF8yJyUuwE+rfxiTPARNAcfvk2aZluLnW77F
+yIutnbUefGHCwizVrZlV5y2TDDbsVsvNDmFpzEYP5l3DzkCtaCS5VhqPYcs24hN6
+Cv5mxYMiXcAzvBfeF00N08eZhMHqjTArwSMy0FDI3x+9eykIdiGAk+bVhGTVgODb
+Aozy2tOSe3IQkBbEhNMwXG6zd0vk+EvjJOY70mDM1fTstk1RlC5SfKOKedR7OPVx
+XWs22uhZ+dUKGogeaw1c8TIN5IecMckSvoBEKlNnWUUqkRZ+uPXc39UAxSgkbp6k
+Nwmwca4vUPP18NPxE6sVgzPFFieSJjeVNXufl0sye1Q=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.testa.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 1e91d8fc..e3e1d033 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -134,4 +134,7 @@
   <xi:include href="swamid-1.0/vmfront.lan.kth.se.xml"/>
   <xi:include href="swamid-1.0/www.testb.antagning.se-aws-sp.xml"/>
   <xi:include href="swamid-1.0/expert.testb.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/expert.testa.antagning.se-ecs-sp.xml"/>
+  <xi:include href="swamid-1.0/shibboleth.testa.antagning.se-shibboleth-idp.xml"/>
+  <xi:include href="swamid-1.0/www.testa.antagning.se-aws-sp.xml"/>
 </EntitiesDescriptor>