SWAMIDOPS-12502

4 files changed, 17 insertions, 10 deletions

diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
index ed05fb1f..363b70e2 100644
--- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp.hb.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://hbidp.hb.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">hb.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Borås - Old</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Borås - Old</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
@@ -129,8 +136,8 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås - Old</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Borås - Old</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index e62183c9..5454bc56 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -4,8 +4,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">hb.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås - Test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
@@ -208,8 +208,8 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås - Test</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås - Test</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 888ef8c3..6da488e0 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -23,7 +23,6 @@
   <xi:include href="swamid-2.0/idp.esh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/swamid2.shh.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.liu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
@@ -50,4 +49,5 @@
   <xi:include href="swamid-2.0/idp01.gih.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 6eb79ae3..a50cb91c 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -17,7 +17,7 @@
   <xi:include href="swamid-2.0/idp.sics.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.his.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.liu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.hb.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>