From 88e3b182ae16ca43f984640272d34ccfe274441f Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Thu, 8 Dec 2022 10:17:26 -0700
Subject: SWAMID-2193: Updated login.varbi.com

---
 ...aml-module.php-saml-sp-metadata.php-varbi-sp.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
index 2c63e612..3c1b2582 100644
--- a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
+++ b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
@@ -6,8 +6,8 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -38,18 +38,17 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml2-logout.php/varbi-sp"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml2-acs.php/varbi-sp" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml1-acs.php/varbi-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml2-acs.php/varbi-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml1-acs.php/varbi-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Varbi</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Varbi</md:ServiceName>
+      <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="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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Varbi AB</md:OrganizationName>
@@ -70,4 +69,8 @@
   <md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:support@varbi.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>support</md:GivenName>
+    <md:EmailAddress>mailto:support@varbi.com</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3