SWAMID-249, New MDUI info + CoCo

6 files changed, 39 insertions, 11 deletions

diff --git a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
index 4bfc13cf..0b29abfb 100644
--- a/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml
@@ -15,8 +15,8 @@
         <mdui:Description xml:lang="en">Test 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>
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
       </mdui:UIInfo>
@@ -219,6 +219,12 @@ YPbGFDgtXE/LKeKsvKgyQIfKUW8=
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp-test.test.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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <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>
+    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
+  </Organization>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>
     <SurName>IT</SurName>
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index 52f1c9c6..23d93291 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -25,8 +25,8 @@
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
         <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
         <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+scieence borås+university+of+library+science</mdui:Keywords>
       </mdui:UIInfo>
diff --git a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
index c0dff203..36c3563c 100644
--- a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
@@ -48,7 +48,8 @@
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -130,6 +131,10 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">konto.bth.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>
diff --git a/swamid-2.0/konto.hb.se-shibboleth.xml b/swamid-2.0/konto.hb.se-shibboleth.xml
index 687a1cc2..3110e9a6 100644
--- a/swamid-2.0/konto.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto.hb.se-shibboleth.xml
@@ -46,7 +46,8 @@
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://konto.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="71" width="350">https://logga.hb.se/HB_logo_sv_350px.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="67" width="350">https://logga.hb.se/HB_logo_en_350px.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -128,6 +129,10 @@ toA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">konto.bth.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>
diff --git a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
index 9a0e20a1..d79706eb 100644
--- a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
@@ -22,6 +22,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -35,9 +36,10 @@
         <mdui:Description xml:lang="en">SelfService Test application.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">http://selfservice.hb.se/images/s2logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
       </mdui:UIInfo>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/Login" index="1"/>
@@ -126,6 +128,10 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">selfservice.hb.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index fd35948b..fc6fd77e 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -22,6 +22,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
@@ -44,9 +45,10 @@
         <mdui:Description xml:lang="en">SelfService application.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.hb.se/Om-hogskolan/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://selfservice.hb.se/PrivacyIntegrity.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://selfservice.hb.se/PrivacyStatement.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="100" width="100">https://selfservice.hb.se/images/s2logo.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -128,6 +130,10 @@ toA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">selfservice.hb.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>