Partially resolves SWAMIDOPS-8921

3 files changed, 4 insertions, 283 deletions

diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
index 9052a7d6..4147dbeb 100644
--- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
@@ -45,6 +45,10 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mp.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mp.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mp.uu.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
diff --git a/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml b/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml
deleted file mode 100644
index a1557b1d..00000000
--- a/swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml
+++ /dev/null
@@ -1,282 +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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogindev.uu.se/idp/shibboleth">
-  <Extensions>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogindev.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogindev.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogindev.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogindev.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogindev.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogindev.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogindev.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPJ6qK1B3Tm9OgnmjMd4XeBQBpSyMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXdlYmxvZ2luZGV2LnV1LnNlMB4XDTE2MDUyMDE1MDgw
-M1oXDTM2MDUyMDE1MDgwM1owHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1SEwk7tE3yTJ6egkz4teq
-VDmfB+6I1F4sK+qBbrYZzvk14CG0Nvo1OtEEhCkRpFpGCHZlhqagn1B8hQcoGQKX
-vgVrmseGuUyylOPClT7xXVybkXtW634btmK01tZc4E+TRaduwM+Sga/ZLbBePrz0
-YXBFR6vvrUBSRXuYnkQPzdt11TuhqKOivt+L4v71inohX2fyPiK1RNdE3LiXKg5M
-x2eePFCeqMlrR4u6FoJRf8tAupxqForjxEjtDZ5WeldtB6vUoEiprFy+YwWtiaox
-4TUTMbM0TGeXqecmeyix1NJjeVph832K7i7yXoPWa1NNEt/4zE2cBXwMVEzksyc9
-AgMBAAGjaTBnMB0GA1UdDgQWBBSHDNuCSiBiLuF2q0ninMDWGeprRjBGBgNVHREE
-PzA9ghF3ZWJsb2dpbmRldi51dS5zZYYoaHR0cHM6Ly93ZWJsb2dpbmRldi51dS5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJSwTQZUS1NmsEWFC
-zVk71E/GIzb9xKPepUGXsLWVIF5N4AfegNY9NQWdoOrNRb17OTzTV8yQqoW29J2o
-0PWjawb6l44d18lw184e4jLT6wPNNGEK2s7+Yg6GmKzGPmmi/fXKBkq/iStcTzAZ
-Ihn4OryakhScNA/S3q5EImHK+tsn8QDuaSwHZ55FdiMyT5aV8TdIaee9tfswUCtr
-bByGpH3CubH5QavLts3TSrrr/dzLh0YUNkQmjPM+VTQOeD44s87ikGp205yIpdK6
-iFHvvvn9vD+5nskqVNwPMkM1LDzSJwpSuWLnp7WeJbK9w91jRGQxtVKcaeq2QnjD
-+2qBYQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUdVZQwYcC1utGXFVvSEGHV5XABBswDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2UwHhcNMTYwNTIwMTUwODAy
-WhcNMzYwNTIwMTUwODAyWjAcMRowGAYDVQQDDBF3ZWJsb2dpbmRldi51dS5zZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHwlQXBij+StAX069/q/iXu
-8KpiRwVGnM7IpGrEGxTZdGoXTV1E9a7iqd8VeTJUN9J2pwK6AJQfJX91PrpmXT7u
-zxKRMr5e+j6nXIBKd5KS4AVRKimmo2oFUzn1YU7BCbxSZ64dV77N/HP9kX/OdKzM
-Rvt9yvAb6MJ+ct87SJnasU8eBOETOtZ6syYfmEtOdeFFO3KxCqYqn1EcBcSLteb+
-XI9dDokIAzOTr3B/y+46u0fgzDnMXLYHmrafHUq+/ftJ4lFAnwwT/UiShf94rDle
-dizqHXmVH9f0JPNvBS5hT0vY6YfbWEX0fuNVO9FSv460jmGmA6TllRqxHcKuHLsC
-AwEAAaNpMGcwHQYDVR0OBBYEFKFx+QlssB9CFyRribH5r/JFVo2MMEYGA1UdEQQ/
-MD2CEXdlYmxvZ2luZGV2LnV1LnNlhihodHRwczovL3dlYmxvZ2luZGV2LnV1LnNl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCXbkuFAerEHV86BLBd
-lre7WA6o+iTMju7hJNyj4zUa9D1UnPLQJIpPD3AicaQHaHYlc7W6OOhCuHOIAV0V
-2HV4fCQmN61xADWos6yQcHelpANdB2cVrdW1HYV5NMA96m1N6qXR/u4LGdp9+F9e
-bJUNH1RJ3oEoY7kvvb1wNK7cKlFJWQDnZnfiE3kdse7Q9XY0zlm7ANxA7mOBZRVF
-KguWb1w7H9Eq4ax7dJZz1GPSZYPvfJGV/ZDqbNdeca6I9kRpZVZyI30iVcPdVW+e
-d+pcXnfiFIYy7SfVJ50bvTIoaOZUjsSK35rciTn19J337wJny/H6r3yqNupWfPeU
-bB32
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <!-- Certificate from weblogin.uu.se/idp/shibboleth -->
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
-DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
-FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
-245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
-wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
-Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
-EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
-LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
-DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
-cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
-7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
-zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
-XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
-MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAP61ec/qEktTX0c+cvMc5pjlj61aMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXdlYmxvZ2luZGV2LnV1LnNlMB4XDTE2MDUyMDE1MDgw
-MloXDTM2MDUyMDE1MDgwMlowHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCD+Ez2MNOmzm56cg/la7ot
-MXaROph6IF3sX6rKKejq3ASs8XWk0PORdT2w6I510SF12GAHNxgtr106OD8y62cL
-4tjb/YMX0qe7rpZwrRIGA4qvGkoYRPD5IdGj/XDxesYOaCQqSffo+cDk3MAKOK+9
-4yJYDSbrjjf+QegIDuS6TrvMdH0vcauX3+n6nsDthsCJy8sg9hcoMJnsH8jC4ITb
-WFnSah3KgA33iU7LVtayEMor0aBjRGb2pIdLEQfBJ/7hQQEeTcvyfzWbtGUzQqq2
-5AdGmRmlpjzL5rDIc1wSm7BFoHFQA0qEKoRgBfqLmI0xFtBYjsNB9M+VCKlONgez
-AgMBAAGjaTBnMB0GA1UdDgQWBBTKTk5xTL6ryD7B0ntCtwkfokYe6zBGBgNVHREE
-PzA9ghF3ZWJsb2dpbmRldi51dS5zZYYoaHR0cHM6Ly93ZWJsb2dpbmRldi51dS5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAgsv0Hbt4QywOeVN2
-gRjhXVfOaPM40oe7W9WBiH7DuSYBqROWUpb38c8wVZV+VAhrQqUJwfljMLKEw2ac
-qjj9JpNCrG863wciixq4HiKqs+pt0yLePHRfa/7Glp/DOX13CAUYmdwEH/f3CE4T
-ccVUDOLbH2kqMT92L90g24u5oJELk42eaa/urw048rczzACbW7x2H1cTZ+DGaalq
-5JUfOU/DRH84lXKL1ppBcYvoiyKBNputdWhSCbIpBevwUvBHslGr0wi+cF0xCwMP
-8av2O3CazjsgCY7B236+HD4xfzhoa44yTM3Z2RBscAn9ILMujPLSk1yGomLNv6dm
-Mu2DZQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogindev.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogindev.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogindev.uu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogindev.uu.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogindev.uu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://weblogindev.uu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogindev.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogindev.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 use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPJ6qK1B3Tm9OgnmjMd4XeBQBpSyMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXdlYmxvZ2luZGV2LnV1LnNlMB4XDTE2MDUyMDE1MDgw
-M1oXDTM2MDUyMDE1MDgwM1owHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1SEwk7tE3yTJ6egkz4teq
-VDmfB+6I1F4sK+qBbrYZzvk14CG0Nvo1OtEEhCkRpFpGCHZlhqagn1B8hQcoGQKX
-vgVrmseGuUyylOPClT7xXVybkXtW634btmK01tZc4E+TRaduwM+Sga/ZLbBePrz0
-YXBFR6vvrUBSRXuYnkQPzdt11TuhqKOivt+L4v71inohX2fyPiK1RNdE3LiXKg5M
-x2eePFCeqMlrR4u6FoJRf8tAupxqForjxEjtDZ5WeldtB6vUoEiprFy+YwWtiaox
-4TUTMbM0TGeXqecmeyix1NJjeVph832K7i7yXoPWa1NNEt/4zE2cBXwMVEzksyc9
-AgMBAAGjaTBnMB0GA1UdDgQWBBSHDNuCSiBiLuF2q0ninMDWGeprRjBGBgNVHREE
-PzA9ghF3ZWJsb2dpbmRldi51dS5zZYYoaHR0cHM6Ly93ZWJsb2dpbmRldi51dS5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJSwTQZUS1NmsEWFC
-zVk71E/GIzb9xKPepUGXsLWVIF5N4AfegNY9NQWdoOrNRb17OTzTV8yQqoW29J2o
-0PWjawb6l44d18lw184e4jLT6wPNNGEK2s7+Yg6GmKzGPmmi/fXKBkq/iStcTzAZ
-Ihn4OryakhScNA/S3q5EImHK+tsn8QDuaSwHZ55FdiMyT5aV8TdIaee9tfswUCtr
-bByGpH3CubH5QavLts3TSrrr/dzLh0YUNkQmjPM+VTQOeD44s87ikGp205yIpdK6
-iFHvvvn9vD+5nskqVNwPMkM1LDzSJwpSuWLnp7WeJbK9w91jRGQxtVKcaeq2QnjD
-+2qBYQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUdVZQwYcC1utGXFVvSEGHV5XABBswDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2UwHhcNMTYwNTIwMTUwODAy
-WhcNMzYwNTIwMTUwODAyWjAcMRowGAYDVQQDDBF3ZWJsb2dpbmRldi51dS5zZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHwlQXBij+StAX069/q/iXu
-8KpiRwVGnM7IpGrEGxTZdGoXTV1E9a7iqd8VeTJUN9J2pwK6AJQfJX91PrpmXT7u
-zxKRMr5e+j6nXIBKd5KS4AVRKimmo2oFUzn1YU7BCbxSZ64dV77N/HP9kX/OdKzM
-Rvt9yvAb6MJ+ct87SJnasU8eBOETOtZ6syYfmEtOdeFFO3KxCqYqn1EcBcSLteb+
-XI9dDokIAzOTr3B/y+46u0fgzDnMXLYHmrafHUq+/ftJ4lFAnwwT/UiShf94rDle
-dizqHXmVH9f0JPNvBS5hT0vY6YfbWEX0fuNVO9FSv460jmGmA6TllRqxHcKuHLsC
-AwEAAaNpMGcwHQYDVR0OBBYEFKFx+QlssB9CFyRribH5r/JFVo2MMEYGA1UdEQQ/
-MD2CEXdlYmxvZ2luZGV2LnV1LnNlhihodHRwczovL3dlYmxvZ2luZGV2LnV1LnNl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCXbkuFAerEHV86BLBd
-lre7WA6o+iTMju7hJNyj4zUa9D1UnPLQJIpPD3AicaQHaHYlc7W6OOhCuHOIAV0V
-2HV4fCQmN61xADWos6yQcHelpANdB2cVrdW1HYV5NMA96m1N6qXR/u4LGdp9+F9e
-bJUNH1RJ3oEoY7kvvb1wNK7cKlFJWQDnZnfiE3kdse7Q9XY0zlm7ANxA7mOBZRVF
-KguWb1w7H9Eq4ax7dJZz1GPSZYPvfJGV/ZDqbNdeca6I9kRpZVZyI30iVcPdVW+e
-d+pcXnfiFIYy7SfVJ50bvTIoaOZUjsSK35rciTn19J337wJny/H6r3yqNupWfPeU
-bB32
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAP61ec/qEktTX0c+cvMc5pjlj61aMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXdlYmxvZ2luZGV2LnV1LnNlMB4XDTE2MDUyMDE1MDgw
-MloXDTM2MDUyMDE1MDgwMlowHDEaMBgGA1UEAwwRd2VibG9naW5kZXYudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCD+Ez2MNOmzm56cg/la7ot
-MXaROph6IF3sX6rKKejq3ASs8XWk0PORdT2w6I510SF12GAHNxgtr106OD8y62cL
-4tjb/YMX0qe7rpZwrRIGA4qvGkoYRPD5IdGj/XDxesYOaCQqSffo+cDk3MAKOK+9
-4yJYDSbrjjf+QegIDuS6TrvMdH0vcauX3+n6nsDthsCJy8sg9hcoMJnsH8jC4ITb
-WFnSah3KgA33iU7LVtayEMor0aBjRGb2pIdLEQfBJ/7hQQEeTcvyfzWbtGUzQqq2
-5AdGmRmlpjzL5rDIc1wSm7BFoHFQA0qEKoRgBfqLmI0xFtBYjsNB9M+VCKlONgez
-AgMBAAGjaTBnMB0GA1UdDgQWBBTKTk5xTL6ryD7B0ntCtwkfokYe6zBGBgNVHREE
-PzA9ghF3ZWJsb2dpbmRldi51dS5zZYYoaHR0cHM6Ly93ZWJsb2dpbmRldi51dS5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAgsv0Hbt4QywOeVN2
-gRjhXVfOaPM40oe7W9WBiH7DuSYBqROWUpb38c8wVZV+VAhrQqUJwfljMLKEw2ac
-qjj9JpNCrG863wciixq4HiKqs+pt0yLePHRfa/7Glp/DOX13CAUYmdwEH/f3CE4T
-ccVUDOLbH2kqMT92L90g24u5oJELk42eaa/urw048rczzACbW7x2H1cTZ+DGaalq
-5JUfOU/DRH84lXKL1ppBcYvoiyKBNputdWhSCbIpBevwUvBHslGr0wi+cF0xCwMP
-8av2O3CazjsgCY7B236+HD4xfzhoa44yTM3Z2RBscAn9ILMujPLSk1yGomLNv6dm
-Mu2DZQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogindev.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogindev.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>
-  <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
-    <TelephoneNumber>+46184717800</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
-    <TelephoneNumber>+46184717800</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Uppsala University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46184717890</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>IT Security Response Team</GivenName>
-    <EmailAddress>mailto:security@uu.se</EmailAddress>
-    <TelephoneNumber>+46184717560</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 33679491..53b74e46 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -12,7 +12,6 @@
   <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/weblogindev-uu-se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.kau.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml"/>