Resolves SWAMIDOPS-8330

5 files changed, 17 insertions, 103 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 4b060ad2..54004457 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -227,7 +227,6 @@ test.mp.uu.se-shibboleth-sso.xml
 testakt.it.ki.se-shibboleth.xml
 testgag.it.ki.se-shibboleth.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
-testshib.user.uu.se-idp-shibboleth.xml
 tta-portal.misc.kth.se-shibboleth.xml
 umdac-olho0001.ad.umu.se-shibboleth.xml
 umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 74b662a5..2b17ad96 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -16,8 +16,8 @@
         <mdui:DisplayName xml:lang="sv">Uppsala universitets TEST kontoaktivering och lösenordsåterställning</mdui:DisplayName>
         <mdui:Description xml:lang="en">As a new user you use this TEST service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
         <mdui:Description xml:lang="sv">Denna TEST tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
-        <mdui:Logo height="50" width="50">https://testshib.user.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://testshib.user.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://konto.test.uu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://konto.test.uu.se</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 2a09eda4..00000000
--- a/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor 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" entityID="https://testshib.user.uu.se/idp/shibboleth">
-  <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">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet. TEST.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university. TEST.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
-OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
-rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
-lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
-342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
-DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
-5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
-sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
-dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
-R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
-iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
-entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
-75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
-1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
-c/xUut3UPRusaRjG
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.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://testshib.user.uu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.user.uu.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">user.uu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
-OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
-rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
-lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
-342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
-DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
-5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
-sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
-dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
-R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
-iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
-entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
-75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
-1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
-c/xUut3UPRusaRjG
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.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-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
index c396b084..d7753536 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -4,9 +4,19 @@
     <Extensions>
       <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala universitet test idp v3</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Uppsala Enter a description of your IdP at weblogin.test.uu.se</mdui:Description>
-        <mdui:Logo height="80" width="80">https://weblogin.test.uu.se/Path/To/Logo.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet. TEST</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university. TEST</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://weblogin.test.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.test.uu.se/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -186,8 +196,8 @@ dqPteAxhBzLEflg+
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uppsala universitet test idp v3</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">Uppsala university</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University TEST</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 43420ace..5da18372 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -10,7 +10,6 @@
   <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>