feat(eidas): add attribute-mapping service to map eIDAS attributs to IDA attributes

11 files changed, 591 insertions, 8 deletions

diff --git a/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/service/EidasAttributeRegistry.java b/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/service/EidasAttributeRegistry.java
index 15c8b3c0..9af4e7ee 100644
--- a/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/service/EidasAttributeRegistry.java
+++ b/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/service/EidasAttributeRegistry.java
@@ -27,21 +27,16 @@ import java.io.File;
 
 import javax.annotation.PostConstruct;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import eu.eidas.auth.commons.attribute.AttributeRegistries;
 import eu.eidas.auth.commons.attribute.AttributeRegistry;
+import lombok.extern.slf4j.Slf4j;
 
 @Service("attributeRegistry")
+@Slf4j
 public class EidasAttributeRegistry {
-  private static final Logger log = LoggerFactory.getLogger(EidasAttributeRegistry.class);
-  @Autowired
-  protected IConfigurationWithSP basicConfig;
 
   private AttributeRegistry coreAttributeRegistry;
 
diff --git a/modules/eidas_proxy-sevice/pom.xml b/modules/eidas_proxy-sevice/pom.xml
index e45d6ee0..4a4ea26f 100644
--- a/modules/eidas_proxy-sevice/pom.xml
+++ b/modules/eidas_proxy-sevice/pom.xml
@@ -52,6 +52,11 @@
       <groupId>eu.eidas</groupId>
       <artifactId>eidas-jcache-ignite-specific-communication</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
         
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
index fd6b45bb..a2a2e78f 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
@@ -20,6 +20,11 @@ public class MsProxyServiceConstants {
   public static final String CONIG_PROPS_EIDAS_PROXY_NODE_FORWARD_URL = EidasConstants.CONIG_PROPS_EIDAS_NODE
       + ".proxy.forward.endpoint";
   
+  
+  public static final String CONIG_PROPS_EIDAS_PROXY_ATTIBUTE_CONFIGURATION = 
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.attribute.mapping.config";
+  
+  
   // mandate configuration
   public static final String CONIG_PROPS_EIDAS_PROXY_MANDATES_ENABLED = 
       EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".proxy.mandates.enabled";  
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/AttrMappingElement.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/AttrMappingElement.java
new file mode 100644
index 00000000..d6ed1147
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/AttrMappingElement.java
@@ -0,0 +1,37 @@
+
+package at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import lombok.Data;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "eidasAttribute",
+    "idaAttribute",
+    "type"
+})
+@Data
+public class AttrMappingElement {
+
+  /**
+   * eIDAS specific attribute name.
+   */
+  @JsonProperty("eidasAttribute")
+  private String eidasAttributeName;
+
+  /**
+   * IDA specific attribute name.
+   */
+  @JsonProperty("idaAttribute")
+  private IdaAttribute idaAttribute;
+  
+  /**
+   * attribute characteristics.
+   */
+  @JsonProperty("type")
+  private Type type;
+  
+}
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/IdaAttribute.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/IdaAttribute.java
new file mode 100644
index 00000000..ee5fc810
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/IdaAttribute.java
@@ -0,0 +1,29 @@
+package at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import lombok.Data;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "basic",
+    "withMandates"
+})
+@Data
+public class IdaAttribute {
+
+  /**
+   * IDA attribute name, in case of simple process without mandates.
+   */
+  @JsonProperty("basic")
+  private String basic;
+
+  /**
+   * IDA attribute name, in case of mandate process.
+   */
+  @JsonProperty("withMandates")
+  private String withMandates;
+  
+}
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java
new file mode 100644
index 00000000..86ca49fa
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java
@@ -0,0 +1,79 @@
+
+package at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import lombok.Data;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "mds",
+    "mandator"
+})
+@Data
+public class Type {
+
+  /**
+   * <code>true</code> if this attribute is part of MDS, otherwise
+   * <code>false</code>
+   */
+  @JsonProperty("mds")
+  private Boolean mds;
+
+  /**
+   * Classifie that attribute to specific mandate modes.
+   */
+  @JsonProperty("mandator")
+  private Type.Mandator mandator;
+
+  /**
+   * Mandate type in case of a mandate attriute.
+   */
+  public enum Mandator {
+    BOTH("both"),
+    LEGAL("legal"),
+    NATURAL("natural"),
+    NONE("none");
+
+    private final String value;
+    private final static Map<String, Type.Mandator> CONSTANTS = new HashMap<>();
+
+    static {
+      for (final Type.Mandator c : values()) {
+        CONSTANTS.put(c.value, c);
+      }
+    }
+
+    Mandator(String value) {
+      this.value = value;
+    }
+
+    @Override
+    public String toString() {
+      return this.value;
+    }
+
+    @JsonValue
+    public String value() {
+      return this.value;
+    }
+
+    @JsonCreator
+    public static Type.Mandator fromValue(String value) {
+      final Type.Mandator constant = CONSTANTS.get(value);
+      if (constant == null) {
+        throw new IllegalArgumentException(value);
+      } else {
+        return constant;
+      }
+    }
+
+  }
+}
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/service/ProxyEidasAttributeRegistry.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/service/ProxyEidasAttributeRegistry.java
new file mode 100644
index 00000000..ea561c1d
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/service/ProxyEidasAttributeRegistry.java
@@ -0,0 +1,176 @@
+package at.asitplus.eidas.specific.modules.msproxyservice.service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.google.common.collect.Sets;
+
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.msproxyservice.MsProxyServiceConstants;
+import at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes.AttrMappingElement;
+import at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes.IdaAttribute;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ProxyEidasAttributeRegistry {
+  
+  private static final String ATTR_CONFIG_ALL = "*";
+  
+  private static ObjectMapper mapper = new ObjectMapper();
+  
+  @Autowired IConfiguration basicConfig;
+  @Autowired ResourceLoader resourceLoader;
+
+  
+  @Getter
+  private EidasAttributeRegistry coreRegistry;
+
+  private Set<AttrMappingElement> attributeConfiguration;
+  
+  
+  /**
+   * Attribute Registry for eIDAS Proxy-Service implementation.
+   * @param registry Core attribute registry
+   */
+  public ProxyEidasAttributeRegistry(@Autowired EidasAttributeRegistry registry) {
+    this.coreRegistry = registry;
+        
+  }
+  
+  
+  /**
+   * Get all attributes that requested from IDA by default.
+   * 
+   * @param withMandates <code>true</code> if mandates are supported, otherwise <code>false</code>
+   * @return {@link Stream} of IDA specific attribute names
+   */
+  @NonNull
+  public Stream<String> getAlwaysRequestedAttributes(boolean withMandates) {
+    return attributeConfiguration.stream()
+        .filter(el -> ATTR_CONFIG_ALL.equals(el.getEidasAttributeName()))
+        .map(el -> getReleadedIdaAttribute(el.getIdaAttribute(), withMandates))
+        .flatMap(Collection::stream)
+        .filter(Objects::nonNull);
+            
+  }
+
+  /**
+   * Get IDA attributes for a specific eIDAS attribute.
+   *   
+   * @param eidasAttributeName Name of the eIDAS attribute.
+   * @param withMandates <code>true</code> if mandates are supported, otherwise <code>false</code>
+   * @return {@link Set} of IDA specific attribute names
+   */
+  @NonNull
+  public Set<String> getIdaAttributesForEidasAttribute(String eidasAttributeName, boolean withMandates) {
+    return attributeConfiguration.stream()
+        .filter(el -> el.getEidasAttributeName().equals(eidasAttributeName))
+        .findFirst()
+        .map(el -> getReleadedIdaAttribute(el.getIdaAttribute(), withMandates))
+        .orElse(Collections.emptySet())
+        .stream()
+        .filter(Objects::nonNull)
+        .collect(Collectors.toSet());
+                
+  }
+  
+  
+  @PostConstruct
+  private void initialize() throws EaafConfigurationException {
+    final String attrConfPath = basicConfig.getBasicConfiguration(
+        MsProxyServiceConstants.CONIG_PROPS_EIDAS_PROXY_ATTIBUTE_CONFIGURATION);
+    
+    log.debug("Initializing eIDAS <--> IDA attribute mapping from: {} ... ", attrConfPath);
+    
+    if (StringUtils.isEmpty(attrConfPath)) {
+      log.error("Error: Path to attribute-mapping config is unknown");
+      throw new EaafConfigurationException("internal.configuration.00", 
+          new Object[]{MsProxyServiceConstants.CONIG_PROPS_EIDAS_PROXY_ATTIBUTE_CONFIGURATION});
+      
+    }
+    
+    try {
+      // reading attribute-configuration file
+      final CollectionType javaType = 
+          mapper.getTypeFactory().constructCollectionType(List.class, AttrMappingElement.class);
+      List<AttrMappingElement> internalAttributeConfiguration = 
+          mapper.readValue(readFromFile(attrConfPath), javaType);
+      log.debug("Found #{} eIDAS <--> IDA attribute-mappings . Starting import process ...  ", 
+          internalAttributeConfiguration.size());
+      
+      // post-validation of attribute configuration
+      attributeConfiguration = internalAttributeConfiguration.stream()
+          .filter(el -> checkEidasAttributeName(el))
+          .collect(Collectors.toSet());        
+      log.info("Load {} eIDAS <--> IDA attribute-mappings into attribute-registry", attributeConfiguration.size());
+                  
+    } catch (Exception e) {
+      log.error("Error reading eIDAS <--> IDA attribute-mapping configuration file", e);
+      throw new EaafConfigurationException("internal.configuration.01",
+          new Object[]{MsProxyServiceConstants.CONIG_PROPS_EIDAS_PROXY_ATTIBUTE_CONFIGURATION, 
+              "Error reading Configurations file"}, e);
+      
+    }    
+  }
+  
+  private Set<String> getReleadedIdaAttribute(IdaAttribute el, boolean withMandates) {
+    return withMandates 
+        ? Sets.newHashSet(el.getBasic(), el.getWithMandates())
+        : Sets.newHashSet(el.getBasic());
+       
+  }
+  
+  private boolean checkEidasAttributeName(AttrMappingElement el) {
+    if (StringUtils.isNotEmpty(el.getEidasAttributeName())) {
+      if (ATTR_CONFIG_ALL.equals(el.getEidasAttributeName()) 
+          || coreRegistry.getCoreAttributeRegistry().getByName(el.getEidasAttributeName()) != null) {
+        return true;
+            
+      } else {
+        log.warn("eIDAS attribute: {} is UNKNOWN by eIDAS node. Ignore it!", el.getEidasAttributeName());
+        
+      }
+      
+    } else {
+      log.warn("Find attribute-mapping element WITHOUT eIDAS attribute-name. Ignore it!");
+      
+    }
+    
+    return false;
+  }
+   
+  private byte[] readFromFile(final String filePath) throws URISyntaxException, IOException {
+    final String fullFilePath = FileUtils.makeAbsoluteUrl(filePath, basicConfig.getConfigurationRootDirectory());
+    final Resource ressource = resourceLoader.getResource(fullFilePath);
+    final InputStream is = ressource.getInputStream();
+    final byte[] result = IOUtils.toByteArray(is);
+    is.close();
+    return result;
+    
+  }
+  
+  
+}
diff --git a/modules/eidas_proxy-sevice/src/main/resources/spring/eidas_proxy-service.beans.xml b/modules/eidas_proxy-sevice/src/main/resources/spring/eidas_proxy-service.beans.xml
index 1eb33e93..78b7640a 100644
--- a/modules/eidas_proxy-sevice/src/main/resources/spring/eidas_proxy-service.beans.xml
+++ b/modules/eidas_proxy-sevice/src/main/resources/spring/eidas_proxy-service.beans.xml
@@ -32,4 +32,7 @@
               ref="specificConnectorAdditionalAttributesFileWithPath" />
   </bean>
   
+  <bean id="proxyAttributeRegistry"
+        class="at.asitplus.eidas.specific.modules.msproxyservice.service.ProxyEidasAttributeRegistry" />
+  
 </beans>
\ No newline at end of file
diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/services/ProxyEidasAttributeRegistryTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/services/ProxyEidasAttributeRegistryTest.java
new file mode 100644
index 00000000..6034c92a
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/services/ProxyEidasAttributeRegistryTest.java
@@ -0,0 +1,95 @@
+package at.asitplus.eidas.specific.modules.msproxyservice.test.services;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+
+import at.asitplus.eidas.specific.modules.msproxyservice.service.ProxyEidasAttributeRegistry;
+import lombok.NonNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {
+    "/spring/SpringTest-context_basic_test.xml",
+    "/spring/SpringTest-context_basic_mapConfig.xml",
+  })
+@EnableWebMvc
+public class ProxyEidasAttributeRegistryTest {
+  
+  @Autowired ProxyEidasAttributeRegistry attrRegistry;
+
+  @Test
+  public void checkDefaultAttributes() {    
+    assertEquals("default attributes without mandates", 2,
+        attrRegistry.getAlwaysRequestedAttributes(false).count());    
+    assertEquals("default attributes with mandates", 4,
+        attrRegistry.getAlwaysRequestedAttributes(true).count());
+    
+  }
+  
+  @Test
+  public void eidasAttributeMapping() {
+    checkAttributeMapping("http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier", false, 
+        Arrays.asList("urn:oid:1.2.40.0.10.2.1.1.149"));
+    checkAttributeMapping("http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier", true, 
+        Arrays.asList("urn:oid:1.2.40.0.10.2.1.1.149", "urn:oid:1.2.40.0.10.2.1.1.261.98"));
+          
+  }
+  
+  @Test
+  public void eidasAttributeMappingMandateOnly() {
+    checkAttributeMapping("http://eidas.europa.eu/attributes/legalperson/LegalPersonIdentifier", false, 
+        Collections.emptyList());
+    checkAttributeMapping("http://eidas.europa.eu/attributes/legalperson/LegalPersonIdentifier", true, 
+        Arrays.asList("urn:oid:1.2.40.0.10.2.1.1.261.100"));
+          
+  }
+
+  @Test
+  public void eidasAttributeMappingWithNoIdaAttribute() {
+    checkAttributeMapping("http://eidas.europa.eu/attributes/naturalperson/PlaceOfBirth", false, 
+        Collections.emptyList());
+    checkAttributeMapping("http://eidas.europa.eu/attributes/naturalperson/PlaceOfBirth", true, 
+        Collections.emptyList());
+          
+  }
+  
+  @Test
+  public void unknownEidasAttribute() {
+    checkAttributeMapping("http://eidas.europa.eu/attributes/jUnit/not/exits", false, 
+        Collections.emptyList());
+    checkAttributeMapping("http://eidas.europa.eu/attributes/jUnit/not/exits", true, 
+        Collections.emptyList());
+          
+  }
+  
+  @Test
+  public void unknownEidasAttribute2() {
+    checkAttributeMapping(RandomStringUtils.randomAlphabetic(10), false, 
+        Collections.emptyList());
+    checkAttributeMapping(RandomStringUtils.randomAlphabetic(10), true, 
+        Collections.emptyList());
+          
+  }
+  
+  private void checkAttributeMapping(String eidasAttr, boolean withMandates, List<String> idaAttributes) {    
+    @NonNull
+    Set<String> idaAttrResult = attrRegistry.getIdaAttributesForEidasAttribute(eidasAttr, withMandates);
+    assertEquals("wrong number of IDA attributes", idaAttributes.size(), idaAttrResult.size());
+    idaAttributes.forEach(
+        el -> assertTrue("missing: " + el, idaAttrResult.contains(el)));
+            
+  }
+  
+}
diff --git a/modules/eidas_proxy-sevice/src/test/resources/config/idaAttributeMapping.json b/modules/eidas_proxy-sevice/src/test/resources/config/idaAttributeMapping.json
new file mode 100644
index 00000000..4f059876
--- /dev/null
+++ b/modules/eidas_proxy-sevice/src/test/resources/config/idaAttributeMapping.json
@@ -0,0 +1,157 @@
+[
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier",
+    "idaAttribute": {
+      "basic": "urn:oid:1.2.40.0.10.2.1.1.149",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.98"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName",
+    "idaAttribute": {
+      "basic": "urn:oid:2.5.4.42",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.78"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/CurrentFamilyName",
+    "idaAttribute": {
+      "basic": "urn:oid:1.2.40.0.10.2.1.1.261.20",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.80"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/DateOfBirth",
+    "idaAttribute": {
+      "basic": "urn:oid:1.2.40.0.10.2.1.1.55",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.82"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/PlaceOfBirth",
+    "idaAttribute": {},
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/BirthName",
+    "idaAttribute": {},
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/legalperson/LegalPersonIdentifier",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.100"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/legalperson/LegalName",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.84"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/representative/PersonIdentifier",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.149"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/representative/CurrentFamilyName",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.20"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/representative/CurrentGivenName",
+    "idaAttribute": {
+      "withMandates": "urn:oid:2.5.4.42"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/naturalperson/representative/DateOfBirth",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.55"
+    },
+    "type": {
+      "mds": true
+    }
+  },
+  {
+    "eidasAttribute": "*",
+    "idaAttribute": {
+      "basic": "urn:oid:1.2.40.0.10.2.1.1.261.32",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.32"
+    },
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "*",
+    "idaAttribute": {
+      "basic": "urn:oid:1.2.40.0.10.2.1.1.261.108",
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.108"
+    },
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "*",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.68"
+    },
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "*",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.106"
+    },
+    "type": {
+      "mds": false
+    }
+  },
+  {
+    "eidasAttribute": "http://eidas.europa.eu/attributes/jUnit/not/exits",
+    "idaAttribute": {
+      "withMandates": "urn:oid:1.2.40.0.10.2.1.1.261.106"
+    },
+    "type": {
+      "mds": false
+    }
+  }
+]
\ No newline at end of file
diff --git a/modules/eidas_proxy-sevice/src/test/resources/config/junit_config_1.properties b/modules/eidas_proxy-sevice/src/test/resources/config/junit_config_1.properties
index 4f3b82b5..bd4575c3 100644
--- a/modules/eidas_proxy-sevice/src/test/resources/config/junit_config_1.properties
+++ b/modules/eidas_proxy-sevice/src/test/resources/config/junit_config_1.properties
@@ -3,4 +3,6 @@ eidas.ms.context.url.prefix=http://localhost
 eidas.ms.context.url.request.validation=false
 
 eidas.ms.auth.eIDAS.node_v2.proxy.entityId=ownSpecificProxy
-eidas.ms.auth.eIDAS.node_v2.proxy.forward.endpoint=http://eidas.proxy/endpoint
\ No newline at end of file
+eidas.ms.auth.eIDAS.node_v2.proxy.forward.endpoint=http://eidas.proxy/endpoint
+
+eidas.ms.auth.eIDAS.proxy.attribute.mapping.config=idaAttributeMapping.json
\ No newline at end of file