From 52c0938721271570e8979bb66f7f85e2185b459e Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 11 Feb 2019 14:56:42 +0100
Subject: Resolved SWAMID-1879

---
 swamid-2.0/idp-test.comanage.sunet.se-sp.xml | 91 +++++++++++-----------------
 swamid-2.0/int.mp.uu.se-shibboleth.sso.xml   | 48 ---------------
 swamid-testing-sp-1.0.mxml                   |  1 -
 3 files changed, 37 insertions(+), 103 deletions(-)
 delete mode 100644 swamid-2.0/int.mp.uu.se-shibboleth.sso.xml

diff --git a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
index e605c1f5..880e6011 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
@@ -1,38 +1,25 @@
 <?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" 
-    xmlns:remd="http://refeds.org/metadata"
-    xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 
-    xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata 
-        sstc-saml-schema-metadata-2.0.xsd 
-        urn:mace:shibboleth:metadata:1.0 
-        shibboleth-metadata-1.0.xsd 
-        http://www.w3.org/2000/09/xmldsig# 
-        xmldsig-core-schema.xsd"
-        entityID="https://idp-test.comanage.sunet.se/Saml2SP/sp">
+<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" xmlns:remd="http://refeds.org/metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata          sstc-saml-schema-metadata-2.0.xsd          urn:mace:shibboleth:metadata:1.0          shibboleth-metadata-1.0.xsd          http://www.w3.org/2000/09/xmldsig#          xmldsig-core-schema.xsd" entityID="https://idp-test.comanage.sunet.se/Saml2SP/sp">
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-        <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-            <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-                <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-            </samla:Attribute>
-        </mdattr:EntityAttributes>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sunets COmanage IDP (test)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP (test)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">COmanage IDP (test) hos Sunet</mdui:Description>
+        <mdui:Description xml:lang="en">COmanage IDP (test) at Sunet</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
-    <SPSSODescriptor 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">Sunets COmanage IDP (test)</mdui:DisplayName>
-                <mdui:DisplayName xml:lang="en">Sunet's COmanage IDP (test)</mdui:DisplayName>
-                <mdui:Description xml:lang="sv">COmanage IDP (test) hos Sunet</mdui:Description>
-                <mdui:Description xml:lang="en">COmanage IDP (test) at Sunet</mdui:Description>
-            </mdui:UIInfo>
-        </Extensions>
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
 MIIEOjCCAqKgAwIBAgIJANaoiJzHBBqYMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNV
 BAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTAeFw0xOTAyMDgxMTQ5MzdaFw0yOTAy
 MDUxMTQ5MzdaMCAxHjAcBgNVBAMTFWlkcC5jb21hbmFnZS5zdW5ldC5zZTCCAaIw
@@ -57,26 +44,22 @@ BNC6JBhMIppOew+KNLzsPNzB5242LBdZd6v0IIR/swP8oi5qFTAe2jwpxAi8QxwE
 v1H4Us0UOyaQ0lqJz6Qz+JxzbZO90KN6TK1YLfs79zhoK1jJt73EOC8iK48dVgY8
 ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
                     </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        <AssertionConsumerService 
-            Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-            Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" 
-            index="1"/>
-    </SPSSODescriptor>
-
-    <Organization>
-        <OrganizationName xml:lang="en">SUNET</OrganizationName>
-        <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
-        <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-        <GivenName>Technical</GivenName>
-        <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="support">
-        <GivenName>Support</GivenName>
-        <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-    </ContactPerson>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.se/Saml2SP/acs/post" index="1"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SUNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical</GivenName>
+    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Support</GivenName>
+    <EmailAddress>mailto:noc@sunet.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml b/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml
deleted file mode 100644
index 06af9d34..00000000
--- a/swamid-2.0/int.mp.uu.se-shibboleth.sso.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://int.mp.uu.se/Shibboleth.sso">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Medarbetarportalen Uppsala universitet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Medarbetarportalen Uppsala universitet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänsten Medarbetarportalen är en portal för anställda vid Uppsala universitet och används som ett "paraply" för andra tjänster vid universitetet samt för publicering av information som rör anställda.</mdui:Description>
-        <mdui:Description xml:lang="en">Medarbetarportalen is a portal for all employees at Uppsala University and is used as an ‘umbrella’ for other services at the university, as well as for pieces of information relevant to all employees.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6zCCAdOgAwIBAgIJAJIGt0tL4NyiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGludC5tcC51dS5zZTAeFw0xMzEwMTcwODU0MThaFw0yMzEwMTUwODU0MTha
-MBcxFTATBgNVBAMTDGludC5tcC51dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAO0AQQzDf857OeNE5/0oB+xcNKEO9+vEr2PH8jONqcZqtMmzdmpz
-vv2+ti/nezoE1RD8g5LKiHcRQMAZyzlXt4ydxAIK2jGumVNIM0lrinqhIEqZX/9p
-suIN6Qvc9MZVEgpojPI5Vq20CQB8vF6E9d95739mFPSGwW/ENhy0E9wg9pEXfZmg
-kMHUDiPkc+QipVvqgnNq1/89q3SYqqdAojHEp7QGFjdIcia3/AhQKWRmnjyxQqTS
-Xaew7L1DqXZLfHveKrmr25v5hu37s/nWhme7y7OCeMpQTtR7F/kE4KLmv80ABpC3
-mrwAfehuOKDV/HKeqHc/qOt2PAjAlNDe49kCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aW50Lm1wLnV1LnNlMB0GA1UdDgQWBBQeedkcB7UXabpD2Qn+kJavhqiTvDANBgkq
-hkiG9w0BAQUFAAOCAQEAAb6QxbcqzcLatN9XfNDWpX4ZNBO71BMdDsUVXqOlARlf
-+cFIn+symaCrJmosEt/q0yMSthrLmtWwysG9o7kYQuLKb0VXGmF+11ITls4CejW3
-DxSWZteV/2rp466eFigR6NdgaDwV3ZS+67FI3644r7y6wHfzWQoQ1ePthcuVU7dH
-fvsw4wpoIe7vJU1tZ23Y9N7RCzeV/eyXln0MI2EhtD69HwsGFt5vuzKVGrSMj2g7
-2rDQ0Eh7P4RNMj2QQlr2HDdhhjr705AlzTA+Jx2SkxhZY1AXDNkdtUJACadKw82X
-QGjKPpU/Hgt9mI7GUPx4BIyh2nfFWWC72b5hzEfT2g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://int.mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://int.mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://int.mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 748120db..810e0831 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -24,7 +24,6 @@
   <xi:include href="swamid-2.0/test-his.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test-mah.hr.evry.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/int.mp.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/akkatest-anv.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/t0253.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/emmautv.ldc.lu.se-shibboleth.xml"/>
-- 
cgit v1.2.3