From 53bb5c6e8910b56ef7217f1d5c5d460c08444d06 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Tue, 2 May 2017 11:29:58 +0200
Subject: Resolves SWAMIDOPS-11945

---
 swamid-2.0/idp.hb.se-idp-shibboleth.xml | 39 ++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index f61d07a1..e62183c9 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -1,12 +1,5 @@
 <?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.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 xmlns="" 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">hb.se</shibmd:Scope>
@@ -125,12 +118,6 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <!--
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hb.se/idp/profile/SAML2/Redirect/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hb.se/idp/profile/SAML2/POST/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.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://idp.hb.se/idp/profile/Shibboleth/SSO"/>
@@ -218,7 +205,29 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
-    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </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>
+    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <Company>University of Borås</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>University of Borås</Company>
+    <SurName>Per-Olof Axelsson</SurName>
+    <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>University of Borås</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
 </EntityDescriptor>
-- 
cgit v1.2.3