Resolves SWAMIDOPS-8314

3 files changed, 59 insertions, 69 deletions

diff --git a/swamid-2.0/adfs-gw.sunet.se-saml2idp-proxy.xml b/swamid-2.0/adfs-gw.sunet.se-saml2idp-proxy.xml
new file mode 100644
index 00000000..7ac00872
--- /dev/null
+++ b/swamid-2.0/adfs-gw.sunet.se-saml2idp-proxy.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" entityID="https://adfs-gw.sunet.se/Saml2IDP/proxy.xml">
+  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:KeyDescriptor use="signing">
+      <ns1:KeyInfo>
+        <ns1:X509Data>
+          <ns1:X509Certificate>MIIFkzCCA3ugAwIBAgIJAJUrDgyu7yXzMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
+BAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxGTAXBgNVBAMMEGFkZnMtZ3cuc3VuZXQuc2UwHhcNMTYw
+OTA3MDUwODIwWhcNMTcwOTA3MDUwODIwWjBgMQswCQYDVQQGEwJTRTETMBEGA1UE
+CAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRk
+MRkwFwYDVQQDDBBhZGZzLWd3LnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOC
+Ag8AMIICCgKCAgEAwUO+Z4Jvr3CCmaZJTe0GDWk7jOqLsfQYT1VjhOv0b+zjnpCp
+JtQSTk5hM0TzGKUMXVDG16ORbRjTFaBDUWWo17tqu18SaFgvN6jPqn2fNo5Q7z1J
+Z7F+zRAIPypm1BIrJhJmcfDMq0yvMB9S+q5delMMbwKoz2JAriOP2F1yxkLoT7hQ
+4JeRVQUsf011UyWSVgwiOvs23NAtLY8kCeyIy8XXilboolkH0q8ub3hLFCreB3IL
+EccRWxb1JQJaG1lZ1xy+tlmgkjv+EYjO8FFUx/hqDXUDL6pJBKsDrptsxPKSa1Sw
+Vw0BkAky9dv4+mdleVwtWtf6jiAQexXVKh2TBOVXK1A+zRpIVNP/j63j2Up+uiCL
+4x0DXCriEBcpUD4l6otdIDWUjJRnQVjGtD5qZ6G3aTHg4SUMPL+dw40f99Y3kLN3
+keRjXqPKDRr6FrEppWawQ2PwDTRajT9qeOYMLQD6SHs7FNqlv+oiOQ1tEZYz2eZf
+I9ityETt5um/F/rabcdhweDa+g9F4G1Q4Lq8NPy6aYsT5nkrqiGmp6zidSbvJ2pY
+j68iYH55VgmC6Kol/Sb9CR9O6v5lwWc2Oy2TTKA5YLF5mR4iEWzzRpDVOEeHeUMg
+eFKksgU1AWeCJ+KzApNZKlkkwibSW0gQWchYcfxbgt6TS0PcVeKlLNHIvq0CAwEA
+AaNQME4wHQYDVR0OBBYEFHLtsqc7PiTu+8OcKtDPmYGtfUCoMB8GA1UdIwQYMBaA
+FHLtsqc7PiTu+8OcKtDPmYGtfUCoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggIBAMFAA0xYqaUNfiRqxWG3h3jx3zgfqZMP9Y4NQYGLH5ZzcOoBnWvH1p+l
+goCcWJSHW826m9S2u1r6PzQE6RWoZO+1+q/S9R9gZtYRCBgdbhH+XZEc3sZmsdO7
+iT9YGN40gKXAVJ6juAdzp16pLA5/aOGMcc+DYx1V9/rs1tcGmBPg+M17r3bqyhtM
+H5f0N8OhFVdYkZq82d3CT1WeGN3R49D5fCc9MhxjSMu+fxsnYiH3oHf4R2jmjljS
+5DqU6IfsOq9D3upMW1NOLsqBDCx/Ap4zzTiU0OHvgRBTvhTpTtggk7uD/uP/qUiG
+NVuerfpopRqyUIagZQGrIRf19vWSAZSa/Sp4brWT/hufEksXWrfFdesSF6045RsP
+ZvASdNALcpmM55r4scBbGcXRsExLfKBBsELP02f4BZxPoCaTN3eAQS/StuWI7xgZ
+eOI/NX5r1tVGqCxfL1guMuuCdNlvg8VvCAw9PM62Y5d+gziiEtQzFmQI7tzBMR0Y
+Fx/SP0qt5zxWLrFo1xqvdRf3zbQQTKQSdIblr3bOAii7L8wWp5tYh85q2Yo+nPrF
+TRWVSsfKr1SdH98LjgbjcrfX557o32iYESme7E4G3DG9Vc7tTOpVdS6wKPlpNg74
+mrJqbshpe6Zc8lDWFe9uAocKQxU35wa9x4P8DjI1STDZV8Rz7lmk
+</ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs-gw.sunet.se/Saml2/sso/redirect"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs-gw.sunet.se/Saml2/sso/post"/>
+  </ns0:IDPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">RKH ADFS Test (IdP)</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">RKH ADFS Test</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">https://example.com</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:GivenName>Technical</ns0:GivenName>
+    <ns0:EmailAddress>technical@example.com</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:GivenName>Support</ns0:GivenName>
+    <ns0:EmailAddress>support@example.com</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml b/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml
deleted file mode 100644
index 1022aeef..00000000
--- a/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://rkh.adfs-proxy-test.swamid.se/Saml2IDP/proxy.xml">
-  <ns0:Extensions>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-  </ns0:Extensions>
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIEBjCCAu6gAwIBAgIJANwxpCjfD5fLMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTAeFw0xNTEy
-MTAxNDMzNTlaFw0yNTEyMDcxNDMzNTlaMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-EwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-GDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOCyQM982ZWJRI6SJ5nPCX2TZATHJfpsWHzXRQpt/vrtmYkvaWKL
-BqSzNhJkiPRrZl4xtJQXtDfUH8ZOnQU0T4IivOuvlP4pytlTYzE1WjSPZY6UJCw5
-MfGnZ+l5vdYv4XiR2dS+L3IYfQeX+pAh61LHXayxMdfNdXRfV+/pnp93qhW5ZjMn
-K076hicbfg4XCXk3Lw7PoJPNWWgcKCwddHMHFSpIhBgp5LtNiooT5hfHypbTSHaQ
-apVlScuzXlMAkeH9srhEO0BDT1Rq0dScMuttF1eY/h+T1N9Vha1dVu1WgynfboaC
-8BUBLM0KoxcguRuGD2/ruFaOCWCMXAv54DcCAwEAAaOBxDCBwTAdBgNVHQ4EFgQU
-as56pDo5FS+9I7xnVXOVp5De8H0wgZEGA1UdIwSBiTCBhoAUas56pDo5FS+9I7xn
-VXOVp5De8H2hY6RhMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xv
-a2kuaXRzLnVtdS5zZYIJANwxpCjfD5fLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEFBQADggEBAAERtzf3jrf0VnwbGr0iOoJUFcuanAObMG6PM20Y/PBdPi0XBnlH
-ReXHkGnMiY44cdyQByJH/HRTIGPmNEwUPtzvsLcwpxWz6sAogQlXhgI6ZHVaTt3T
-XBJGBi+cuG4ggRZSvcmJLwJ1EpwWXNVekiIEQbW+mlwARLbM5N7btQRA3DWofbIx
-JLn4HckD/n5dq5ueniyDqDgc2o1V2/G/zpEg90lIN7gsSOOqsbttMZFvGq3m+t3E
-KxjpGx+7PhkGMf9zCVrXXztaqDyZjeNa/rpADj+kU6KudZ9eESvdppCBR0EiROm0
-8xZOMdYU6Sc6SJVa/W48bqJsv95pCZM6joU=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/redirect"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">RKH ADFS Test (IdP)</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">RKH ADFS Test</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://example.com</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>technical@example.com</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@example.com</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5e18f667..1063ac5e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -484,7 +484,6 @@
   <xi:include href="swamid-2.0/play.bth.se.xml"/>
   <xi:include href="swamid-2.0/test.play.bth.se.xml"/>
   <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml"/>
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/inacademia.org-metadata-t01-p-test.xml"/>
@@ -603,4 +602,5 @@
   <xi:include href="swamid-2.0/www4.kau.se-isp.xml"/>
   <xi:include href="swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.verifiering1.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/adfs-gw.sunet.se-saml2idp-proxy.xml"/>
 </md:EntitiesDescriptor>