SWAMIDOPS-8456, 1:st update also waiting for some MDUI info before resolving

4 files changed, 26 insertions, 17 deletions

diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
index e14150ac..68770823 100644
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -1,21 +1,23 @@
 <?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://idp.hh.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata: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>
-    </attr: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">hh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad - new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Halmstad University - new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hh.se</mdui:InformationURL>
+        <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>hh.se</mdui:DomainHint>
+        <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
+        <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -183,8 +185,8 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad - new</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Halmstad University - new</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 4a0dae4e..08e7dab2 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -1,11 +1,18 @@
 <?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://signon.hh.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata: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>
+    </attr:EntityAttributes>
+  </Extensions>
   <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">hh.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad - old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Halmstad University - old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
@@ -96,8 +103,8 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad - old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Halmstad University - old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 8ced9c12..28c9f451 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -17,7 +17,6 @@
   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/idp.kb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/identity.mdh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.kmh.se-idp-shibboleth.xml"/>
@@ -50,4 +49,5 @@
   <xi:include href="swamid-2.0/idp.hj.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.sunet.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp.ltu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 5aef0206..886d74e0 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,7 +16,7 @@
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/signon.hh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.sics.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>