SWAMID-393, Added CoCo to account.hh.se and account-utv.hh.se

2 files changed, 43 insertions, 14 deletions

diff --git a/swamid-2.0/account-utv.hh.se-shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index fd3f543e..79176220 100644
--- a/swamid-2.0/account-utv.hh.se-shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-shibboleth.xml
@@ -25,6 +25,7 @@
         <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>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -41,6 +42,8 @@
         <mdui:Logo xml:lang="en" height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://account-utv.hh.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://account-utv.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -95,16 +98,24 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Halmstad University, account activation and password reset</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</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>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Högskolan i Halmstad</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
+    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Halmstad university</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:Company>Högskolan i Halmstad</md:Company>
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Gabrielsson</md:SurName>
-    <md:EmailAddress>mailto:bjorn.gabrielsson@hh.se</md:EmailAddress>
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/account.hh.se-Shibboleth.xml b/swamid-2.0/account.hh.se-Shibboleth.xml
index 1c780258..18c55c67 100644
--- a/swamid-2.0/account.hh.se-Shibboleth.xml
+++ b/swamid-2.0/account.hh.se-Shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://account.hh.se/Shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-12-21T11:20:29Z">
@@ -25,10 +21,11 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <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:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <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>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -40,10 +37,12 @@ and do *NOT* provide it in real time to your partners.
         <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</mdui:DisplayName>
         <mdui:Description xml:lang="en">As a new user you can use this service to activate your university computer account or reset your password.</mdui:Description>
         <mdui:Description xml:lang="sv">Med denna tjänst kan du aktivera ditt datorkonto vid högskolan eller återställa ditt glömda lösenord.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="116" width="350">https://account.hh.se/images/hh-logo-sv-350x116.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="116" width="350">https://account.hh.se/images/hh-logo-en-350x116.png</mdui:Logo>
+        <mdui:Logo height="116" width="350" xml:lang="sv">https://account.hh.se/images/hh-logo-sv-350x116.png</mdui:Logo>
+        <mdui:Logo height="116" width="350" xml:lang="en">https://account.hh.se/images/hh-logo-en-350x116.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://account.hh.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://account.hh.se</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.hh.se/om-webbplatsen/behandling-av-personuppgifter/overforing-av-personuppgifter-till-account.hh.se-samt-account-utv.hh.se-i-samband-med-federerad-inloggning-privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -92,5 +91,24 @@ bK0IFZ5apkn9N3YME8KiyAf5bSY31fBoQVszf+Gm2wN+qw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Halmstad University, account activation and password reset</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</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>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HH</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">HH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Halmstad university</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Halmstad university</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.hh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.hh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>