From b3a0302041d08ba8360d96216b6da67580850717 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 27 Sep 2023 14:07:56 +0200
Subject: feat(eidas): refactoring to eIDAS node v2.7

---
 .../modules/core/eidas/EidasConstants.java         |  4 ++
 .../main/resources/eidas_v27_connector.beans.xml   | 47 +++++++++++++++++++++
 .../resources/eidas_v27_proxyservice.beans.xml     | 48 ++++++++++++++++++++++
 .../eidas_v2_auth_ref_impl_config.beans.xml        | 20 ++++-----
 4 files changed, 107 insertions(+), 12 deletions(-)
 create mode 100644 modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
 create mode 100644 modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml

(limited to 'modules/core_commons_eidas/src')

diff --git a/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/EidasConstants.java b/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/EidasConstants.java
index ac17c30f..a2e2ba03 100644
--- a/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/EidasConstants.java
+++ b/modules/core_commons_eidas/src/main/java/at/asitplus/eidas/specific/modules/core/eidas/EidasConstants.java
@@ -8,6 +8,10 @@ package at.asitplus.eidas.specific.modules.core.eidas;
  */
 public class EidasConstants {
 
+  // references to eIDAS Node implementation
+  public static final String SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE = "connectorCommunicationService";
+  public static final String SPECIFIC_PROXYSERVICE_COMMUNICATION_SERVICE = "proxyCommunicationService";
+
   // common config ore-fixes
   public static final String CONIG_PROPS_EIDAS_PREFIX = "auth.eIDAS";
   public static final String CONIG_PROPS_EIDAS_NODE = EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".node_v2";
diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
new file mode 100644
index 00000000..fb17b857
--- /dev/null
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v27_connector.beans.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+    <!--Connector to specific-->
+    <import resource="classpath:eidas_v2_auth_ref_impl_config.beans.xml" />
+    <import resource="classpath:connectorSpecificCommunicationCaches.xml" />   
+       
+    <bean id="connectorCommunicationService" class="eu.eidas.specificcommunication.protocol.impl.SpecificCommunicationAdapterService" scope="prototype">
+        <constructor-arg index="0" ref="connectorRequestService"/>
+        <constructor-arg index="1" ref="connectorResponseService"/>
+    </bean>
+
+  	<bean id="specificConnectorAttributesFileWithPath"
+    	  class="java.lang.String">
+      <constructor-arg
+		value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
+  	</bean>
+
+  	<bean id="specificConnectorAdditionalAttributesFileWithPath"
+		  class="java.lang.String">
+      <constructor-arg
+      	value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
+  	</bean>
+
+    <bean id="connectorRequestService" class="eu.eidas.specificcommunication.protocol.impl.RequestSpecificCommunicationServiceImpl" scope="prototype">
+        <constructor-arg index="0" type="java.lang.String" value="${lightToken.connector.request.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${lightToken.connector.request.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${lightToken.connector.request.algorithm}"/>
+        <constructor-arg index="3" ref="specificNodeConnectorRequestCache"/>
+    </bean>
+
+    <bean id="connectorResponseService" class="eu.eidas.specificcommunication.protocol.impl.ResponseSpecificCommunicationServiceImpl" scope="prototype">
+        <constructor-arg index="0" type="java.lang.String" value="${lightToken.connector.response.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${lightToken.connector.response.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${lightToken.connector.response.algorithm}"/>
+        <constructor-arg index="3" ref="nodeSpecificConnectorResponseCache"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml
new file mode 100644
index 00000000..ea2f5a7d
--- /dev/null
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v27_proxyservice.beans.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  	<import resource="classpath:eidas_v2_auth_ref_impl_config.beans.xml" />
+  
+      <!--    Proxy to specific-->
+    <import resource="classpath:proxySpecificCommunicationCaches.xml" />
+
+  	<bean id="specificConnectorAttributesFileWithPath"
+    	  class="java.lang.String">
+      <constructor-arg
+		value="#{specificProxyServiceConfigRepository}#{specificConnectorAttributesFile}" />
+  	</bean>
+
+  	<bean id="specificConnectorAdditionalAttributesFileWithPath"
+		  class="java.lang.String">
+      <constructor-arg
+      	value="#{specificProxyServiceConfigRepository}#{specificAdditionalAttributesFile}" />
+  	</bean>
+
+    <bean id="proxyCommunicationService" class="eu.eidas.specificcommunication.protocol.impl.SpecificCommunicationAdapterService" scope="prototype">
+        <constructor-arg index="0" ref="serviceRequestService"/>
+        <constructor-arg index="1" ref="serviceResponseService"/>
+    </bean>
+
+    <bean id="serviceRequestService" class="eu.eidas.specificcommunication.protocol.impl.RequestSpecificCommunicationServiceImpl" scope="prototype">
+        <constructor-arg index="0" type="java.lang.String" value="${lightToken.proxyservice.request.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${lightToken.proxyservice.request.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${lightToken.proxyservice.request.algorithm}"/>
+        <constructor-arg index="3" ref="nodeSpecificProxyserviceRequestCache"/>
+    </bean>
+
+    <bean id="serviceResponseService" class="eu.eidas.specificcommunication.protocol.impl.ResponseSpecificCommunicationServiceImpl" scope="prototype">
+        <constructor-arg index="0" type="java.lang.String" value="${lightToken.proxyservice.response.issuer.name}"/>
+        <constructor-arg index="1" type="java.lang.String" value="${lightToken.proxyservice.response.secret}"/>
+        <constructor-arg index="2" type="java.lang.String" value="${lightToken.proxyservice.response.algorithm}"/>
+        <constructor-arg index="3" ref="specificNodeProxyserviceResponseCache"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml b/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
index cde9687e..f0038a8e 100644
--- a/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
+++ b/modules/core_commons_eidas/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
@@ -10,10 +10,7 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
   <context:annotation-config />
-
-  <import
-    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
-
+                       
   <bean id="specificConnectorAttributesFile"
     class="java.lang.String">
     <constructor-arg value="eidas-attributes.xml" />
@@ -24,16 +21,15 @@
     <constructor-arg value="additional-attributes.xml" />
   </bean>
 
-  <bean id="specificConnectorAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
+  <bean id="customEidasNodeSpringContextProvider"
+  		class="eu.eidas.specificcommunication.SpecificCommunicationApplicationContextProvider" /> 
+
+  <bean id="incomingLightRequestValidator" class="eu.eidas.specificcommunication.protocol.validation.IncomingLightRequestValidator">
+    <constructor-arg index="0" value="${incoming.lightRequest.max.number.characters:65535}"/>
   </bean>
 
-  <bean id="specificConnectorAdditionalAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
+  <bean id="incomingLightResponseValidator" class="eu.eidas.specificcommunication.protocol.validation.IncomingLightResponseValidator">
+    <constructor-arg index="0" value="${incoming.lightResponse.max.number.characters:65535}"/>
   </bean>
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3