Resolves SWAMID-2580

2 files changed, 44 insertions, 8 deletions

diff --git a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml b/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
index c5edab18..07430d78 100644
--- a/swamid-2.0/apps.convertus.se-ki-shibboleth.xml
+++ b/swamid-2.0/apps.convertus.se-ki-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://apps.convertus.se/ki/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -24,10 +20,24 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <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://apps.convertus.se/ki/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
+        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -72,4 +82,12 @@ zHEpRj4+aQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sebastian Schleussner</md:SurName>
+    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml b/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
index 68ff8e37..db098606 100644
--- a/swamid-2.0/appstest.convertus.se-ki-shibboleth.xml
+++ b/swamid-2.0/appstest.convertus.se-ki-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://appstest.convertus.se/ki/shibboleth">
   <md:Extensions>
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
@@ -24,10 +20,24 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <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://appstest.convertus.se/ki/Shibboleth.sso/Login"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Convertus Kursplaneöversättare</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Convertus Syllabus Translator</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Convertus Kursplaneöversättare</mdui:Description>
+        <mdui:Description xml:lang="en">Convertus Syllabus Translator</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.convertus.se/sv/tjanster</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.convertus.se/en/services</mdui:InformationURL>
+        <mdui:Logo height="100" width="100">https://convertus.se/logo.png</mdui:Logo>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -72,4 +82,12 @@ osdSjbJvuw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appstest.convertus.se/ki/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Sebastian Schleussner</md:SurName>
+    <md:EmailAddress>mailto:sebastian.schleussner@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:support@convertus.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>