Resolved SWAMID-803

3 files changed, 102 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 279dfa17..157dc05f 100644
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ testRoleDescriptor:
 	@for x in `find $(SRCDIRS) -name \*.xml`; do \
 		grep -EH 'RoleDescriptor.*xsi:type="fed:(ApplicationServiceType|SecurityTokenServiceType)"' $$x | \
 		 sed -e 's/^/  /' -e 's/xmlns.*xsi:type="fed:/xsi:type="fed:/' -e 's/ protocol.*>/>/' -e 's/.*/&/' ; \
-	done | grep . && echo "Please remove" || exit 0
+	done | grep . && exit 1 || exit 0
 
 testAttributeInIdP:
 	@echo "Check for Attribute inside IDPSSODescriptor"
@@ -234,7 +234,7 @@ testAttributeInIdP:
 		if  cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor" - 2>/dev/null | grep -q "    <Attribute Name" ; then \
 			echo "  $$x" | sed 's/.*/&/' ;\
 		fi;\
-	done | grep . && echo "Please remove this Attributes" || exit 0
+	done | grep . && exit 1 || exit 0
 
 test: syntaxtest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP
 
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
new file mode 100644
index 00000000..c30de0d2
--- /dev/null
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.test.umu.se/adfs/services/trust">
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Umeå University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">
+			https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/ 
+			</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">
+			https://www.aurora.umu.se/regler-och-riktlinjer/juridik/personuppgifter/ 
+			</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFPzCCBCegAwIBAgIQCHbY9n83XT9xy1+U7v4YHDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMHUxCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MSowKAYDVQQDEyF0b2tlbi1kZWNyeXB0aW5nLmZzLnRlc3RhZC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1Q6T+plZVtok2jfpfM1DzAilo9zsO2sbUeIeqqFBv/S2FPhJ0PfQj18yNIG1WxSvlyv68BIKTmgYNox9/6Oh9N9s5kVl79XRr+XOwfuO2ZLjrzp7G8+qqxFDull/Gw9dwnzBS+k4EKv+sVx5IOBTvQjKLFwyQ4h9ZbV8K8Ij4XxXXIoi7xwB38SMVtYquhrEAVEfqR10/ncPB16gJKrAIYMwCD7d0tYnW5yYLDmn8vwFdpY4MWp47D5p4MAR5EatNFdmDbzG2rKhei3vp1c++27hPxJzgmgLiuFX/dmUyauNuP9KHc8LKYU2NXUjmxoaPQTYYweIPUXg2X/mFhFxXAgMBAAGjggHaMIIB1jAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUcIDKMDgUpSjQ9zeUVdNpcL+r7XswLAYDVR0RBCUwI4IhdG9rZW4tZGVjcnlwdGluZy5mcy50ZXN0YWQudW11LnNlMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBgJj0XyQRDZ5oqghPfYsha/8aGBwwHuUSdIpItWZyvJq8h0Mgz8b3sGeuCLAMolOaKbKjzpu0nKQzXjNgZGQLaDY9iEmYiif9EixQ5zEId/XwV/SmA9HcQG5vAhMHbuhgjrG6kmxFrtFy3DL6X7T99zQdkZfmu0XMewN3t2x5IuNQUegNRQFSWqX9an7z8n1tHvefObR6+Q6s/uot7AqDeU0t1qV2P2oyKNlUlfh92j4Lj9R9iPNyd1xxSgBuLwpChNyhtsvOTKpPpuyOJrWRKMX9D0RyZu9HctiH0S/CAbKifmYOCHQDHxLLC77C4LJsYgcB0oSwi495OHQn6F2Sj</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFOTCCBCGgAwIBAgIQBKWHLemKBpQxbT76jelBTzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMHIxCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MScwJQYDVQQDEx50b2tlbi1zaWduaW5nLmZzLnRlc3RhZC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKBaSbszGeXv44Dw+2sHPdq/aGRFOAf8vJJ4wbRYwJ7jnyHrukoZvwE30FE3mmh0QIXyWXmhYO4M0WhMiOeKy3qXW5xQsSRArYBF6Zwd3OY9dvpB/h4GedVJf1bamNvHioKkciEk4n6//2DyCpZzRC77ZxZOmt3bRRFFoler53GaQUcAMar4C75eqA14u5S7XY1UhOyEffIwbjacFR77UNlRYa8m5YRry0fVG96y7u83nQ89mzp9ZigvB4bP6lj4Na6RaqnrowUvJR2/oF2J0xiRivkpSQ8g4dx8PABduXw07OlYzdxJ/hq7PPjg8CHcnnIeb7apRMKdqeZ2C1mG+lAgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUMr5/twZ9e2Kfe0f0X7R+V7LsjvAwKQYDVR0RBCIwIIIedG9rZW4tc2lnbmluZy5mcy50ZXN0YWQudW11LnNlMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBoDrOZDFN8DFPm4luIx6H1oPoFWvArthtFlwrVipLMWkzrEygCWNPFVNYzZqJPM1nojNwSl8t+vLSsmfFJOHg+DfY3s4AAgnNeqUX2CPGdxxVLaxIm557uTvEcHaophOX2Uzf01A7DbiqB4vHJ1KxnveqsaCn9JOza7mVoTkQJnXVcZ4Qv19vb9gIOSRgM+xILyr5w/r+XlQhG5b65Oexd2x9KqdeN23r+evjEhjFKiyBHttXfWbOciPAWecTLRrSWdFrslK2LfWzebDwYBJK/Ix9S2DbhJPvMA60E5cdCmDChUDr/K/woKsRK1kTemTvIhSz/Syc2zje7EF1SKSXB</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
+      <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">
+				Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).
+				</mdui:Description>
+        <mdui:Description xml:lang="en">
+				Identity Provider for employees and students at Umeå University (TEST).
+				</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="sv">
+				umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
+				</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">
+				umu umeå+universitet umea+universitet umea+university umeå+university umeå umea
+				</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>umu.se</mdui:DomainHint>
+        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFPzCCBCegAwIBAgIQCHbY9n83XT9xy1+U7v4YHDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMHUxCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MSowKAYDVQQDEyF0b2tlbi1kZWNyeXB0aW5nLmZzLnRlc3RhZC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1Q6T+plZVtok2jfpfM1DzAilo9zsO2sbUeIeqqFBv/S2FPhJ0PfQj18yNIG1WxSvlyv68BIKTmgYNox9/6Oh9N9s5kVl79XRr+XOwfuO2ZLjrzp7G8+qqxFDull/Gw9dwnzBS+k4EKv+sVx5IOBTvQjKLFwyQ4h9ZbV8K8Ij4XxXXIoi7xwB38SMVtYquhrEAVEfqR10/ncPB16gJKrAIYMwCD7d0tYnW5yYLDmn8vwFdpY4MWp47D5p4MAR5EatNFdmDbzG2rKhei3vp1c++27hPxJzgmgLiuFX/dmUyauNuP9KHc8LKYU2NXUjmxoaPQTYYweIPUXg2X/mFhFxXAgMBAAGjggHaMIIB1jAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUcIDKMDgUpSjQ9zeUVdNpcL+r7XswLAYDVR0RBCUwI4IhdG9rZW4tZGVjcnlwdGluZy5mcy50ZXN0YWQudW11LnNlMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBgJj0XyQRDZ5oqghPfYsha/8aGBwwHuUSdIpItWZyvJq8h0Mgz8b3sGeuCLAMolOaKbKjzpu0nKQzXjNgZGQLaDY9iEmYiif9EixQ5zEId/XwV/SmA9HcQG5vAhMHbuhgjrG6kmxFrtFy3DL6X7T99zQdkZfmu0XMewN3t2x5IuNQUegNRQFSWqX9an7z8n1tHvefObR6+Q6s/uot7AqDeU0t1qV2P2oyKNlUlfh92j4Lj9R9iPNyd1xxSgBuLwpChNyhtsvOTKpPpuyOJrWRKMX9D0RyZu9HctiH0S/CAbKifmYOCHQDHxLLC77C4LJsYgcB0oSwi495OHQn6F2Sj</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIFOTCCBCGgAwIBAgIQBKWHLemKBpQxbT76jelBTzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMHIxCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MScwJQYDVQQDEx50b2tlbi1zaWduaW5nLmZzLnRlc3RhZC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKBaSbszGeXv44Dw+2sHPdq/aGRFOAf8vJJ4wbRYwJ7jnyHrukoZvwE30FE3mmh0QIXyWXmhYO4M0WhMiOeKy3qXW5xQsSRArYBF6Zwd3OY9dvpB/h4GedVJf1bamNvHioKkciEk4n6//2DyCpZzRC77ZxZOmt3bRRFFoler53GaQUcAMar4C75eqA14u5S7XY1UhOyEffIwbjacFR77UNlRYa8m5YRry0fVG96y7u83nQ89mzp9ZigvB4bP6lj4Na6RaqnrowUvJR2/oF2J0xiRivkpSQ8g4dx8PABduXw07OlYzdxJ/hq7PPjg8CHcnnIeb7apRMKdqeZ2C1mG+lAgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUMr5/twZ9e2Kfe0f0X7R+V7LsjvAwKQYDVR0RBCIwIIIedG9rZW4tc2lnbmluZy5mcy50ZXN0YWQudW11LnNlMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBoDrOZDFN8DFPm4luIx6H1oPoFWvArthtFlwrVipLMWkzrEygCWNPFVNYzZqJPM1nojNwSl8t+vLSsmfFJOHg+DfY3s4AAgnNeqUX2CPGdxxVLaxIm557uTvEcHaophOX2Uzf01A7DbiqB4vHJ1KxnveqsaCn9JOza7mVoTkQJnXVcZ4Qv19vb9gIOSRgM+xILyr5w/r+XlQhG5b65Oexd2x9KqdeN23r+evjEhjFKiyBHttXfWbOciPAWecTLRrSWdFrslK2LfWzebDwYBJK/Ix9S2DbhJPvMA60E5cdCmDChUDr/K/woKsRK1kTemTvIhSz/Syc2zje7EF1SKSXB</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
+  </IDPSSODescriptor>
+  <ContactPerson contactType="support">
+    <EmailAddress/>
+    <TelephoneNumber/>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 6dd72045..d61bf51a 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -56,4 +56,5 @@
   <xi:include href="swamid-2.0/idp.dev.eduid.se-idp.xml.xml"/>
   <xi:include href="swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.it.su.se.xml"/>
+  <xi:include href="swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml"/>
 </EntitiesDescriptor>