Merge branch 'master' of git.swamid.se:swamid-metadata

1 files changed, 44 insertions, 6 deletions

diff --git a/swamid-2.0/klara.port.se-shibboleth.xml b/swamid-2.0/klara.port.se-shibboleth.xml
index c13f2480..dc01a2f4 100644
--- a/swamid-2.0/klara.port.se-shibboleth.xml
+++ b/swamid-2.0/klara.port.se-shibboleth.xml
@@ -22,8 +22,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
@@ -37,6 +35,10 @@
         <mdui:DisplayName xml:lang="en">KLARA</mdui:DisplayName>
         <mdui:Description xml:lang="sv">KLARA är ett webbaserat system med syfte att inventera, sammanställa, visa och följa upp information om kemikalier och kemiska produkter som hanteras av en organisation.  Systemet skall även fungera som ett informationssystem till alla som hanterar kemikalier i organisationen.  Med hjälp av KLARA kan man enkelt få svar på frågor som rör den egna verksamhetens hantering av kemikalier</mdui:Description>
         <mdui:Description xml:lang="en">KLARA is a web based system with the purpose of making it easier and more time efficient for management and staff to make inventories, compile, view and follow up information about chemicals and chemical products which are used by the organisation in a cost effective way.  KLARA serve as an information system to all who handle chemicals within your organisation.  KLARA allows you to control and monitor all of your organisation's chemical usage in detail.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.ecoonline.se/mjukvara/klara-kemikaliehantering</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.ecoonline.se/mjukvara/klara-kemikaliehantering</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ecoonline.se/integritetspolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ecoonline.se/integritetspolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -66,8 +68,7 @@ MbGBrwgTpnpjtYtq1PwCKaKubOWVYHvEv5N1L81LLBdHXi98Oyf2fWLI+f7/24Sx
 zYm65XPChl//KK9y4ds1BZJ7dHGdPQetYbHsJ1eBI1ZEGCtMXMTUjT5eP75JCIG+
 6Z+hkmmT74/T+wEavTS7mx0UJcDmkSeXHzydcCDN/yYhQ/2yo/U6TZKE+jG7aCkX
 HbXHH4lxoBVjEQyDCBQiJMbWXDsBUl3j9Am+WNQpDektF4oT4j2Q1xMgz6vZ3jun
-K7owlPvwR8ekvg==
-</ds:X509Certificate>
+K7owlPvwR8ekvg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -98,8 +99,7 @@ NJHrIBY4O5ZIGjQ1TwNZ9eKzWj6fgj1EIzalExJIOSJqnqGtdJ8vluOWwo+KbMyq
 kP9jgdUwH8BRc9JJpJwBwfY9XUVg6w+7RLY+p4QsANGWIF7a9i0iqQkKjwdiUzwa
 lFCmbNv+usdh9TH46N/7Ja7uiFJT0pSkpyEdiIb8pdLjPYtDB2IGtz7MLCYH/Cv0
 jg+K0Ja8Rx+pKcY71szjmUSOyY7rZNPya8TMV+SSHjbFjr1lth5Q8MhWjLINjm7r
-tbiEvSMrr8hroQ==
-</ds:X509Certificate>
+tbiEvSMrr8hroQ==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -122,8 +122,46 @@ tbiEvSMrr8hroQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://klara.port.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://klara.port.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://klara.port.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">KLARA</md:ServiceName>
+      <md:ServiceName xml:lang="sv">KLARA</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Ecoonline</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ecoonline</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Ecoonline</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ecoonline</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://ecoonline.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://ecoonline.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
+    <md:Company>Ecoonline</md:Company>
+    <md:GivenName>Lennart</md:GivenName>
+    <md:SurName>Risfelt</md:SurName>
+    <md:EmailAddress>mailto:lennart.risfelt@ecoonline.com</md:EmailAddress>
+    <md:TelephoneNumber>+46708602176</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Ecoonline</md:Company>
+    <md:EmailAddress>mailto:lennart.risfelt@ecoonline.com</md:EmailAddress>
+    <md:TelephoneNumber>+46708602176</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:support.klara@ecoonline.com</md:EmailAddress>
+    <md:TelephoneNumber>+46317572020</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Ecoonline</md:Company>
     <md:GivenName>Lennart</md:GivenName>
     <md:SurName>Risfelt</md:SurName>
     <md:EmailAddress>mailto:lennart.risfelt@ecoonline.com</md:EmailAddress>