feat(eidas): refactoring to eIDAS node v2.7

3 files changed, 64 insertions, 5 deletions

diff --git a/ms_specific_proxyservice/src/main/resources/application.properties b/ms_specific_proxyservice/src/main/resources/application.properties
index cb55fb2c..d6918a97 100644
--- a/ms_specific_proxyservice/src/main/resources/application.properties
+++ b/ms_specific_proxyservice/src/main/resources/application.properties
@@ -69,6 +69,19 @@ eidas.ms.auth.eIDAS.node_v2.proxy.entityId=ownSpecificProxy
 eidas.ms.auth.eIDAS.node_v2.proxy.forward.errors=false
 eidas.ms.auth.eIDAS.node_v2.forward.method=POST
 
+
+ # TODO change namespaces if required
+lightToken.proxyservice.request.issuer.name=specificCommunicationDefinitionConnectorRequest
+lightToken.proxyservice.request.node.id=specificConnector 
+lightToken.proxyservice.request.secret=mySecretConnectorRequest
+lightToken.proxyservice.request.algorithm=SHA-256
+lightToken.proxyservice.response.issuer.name=specificCommunicationDefinitionConnectorResponse
+lightToken.proxyservice.response.node.id=specificConnector
+lightToken.proxyservice.response.secret=mySecretConnectorResponse
+lightToken.proxyservice.response.algorithm=SHA-256
+incoming.lightRequest.max.number.characters=65535
+
+
 # Mandate configuration
 eidas.ms.auth.eIDAS.proxy.mandates.enabled=true
 eidas.ms.auth.eIDAS.proxy.mandates.profiles.natural.default=GeneralvollmachtBilateral
diff --git a/ms_specific_proxyservice/src/main/resources/environmentContext.xml b/ms_specific_proxyservice/src/main/resources/environmentContext.xml
new file mode 100644
index 00000000..ccfab8f5
--- /dev/null
+++ b/ms_specific_proxyservice/src/main/resources/environmentContext.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023 by European Commission
+  ~
+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be
+  ~ approved by the European Commission - subsequent versions of the
+  ~ EUPL (the "Licence");
+  ~ You may not use this work except in compliance with the Licence.
+  ~ You may obtain a copy of the Licence at:
+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the Licence is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  ~ implied.
+  ~ See the Licence for the specific language governing permissions and
+  ~ limitations under the Licence.
+  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+
+    <!--
+
+    Configuration repository path either from ENVIRONMENT variable or COMMAND LINE -D option of
+            EIDAS_CONNECTOR_CONFIG_REPOSITORY and
+         For any other option - like hard-coded values - modify this file.
+          Hard coding example:
+
+    <bean id="specificCommunicationConfigRepository" class="java.lang.String">
+        <constructor-arg value="c:/PGM/projects/configEidas/glassfish/" />
+    </bean>
+
+    -->
+
+    <!--mandatory ENV-->
+
+    <bean id="specificProxyServiceConfigRepository" class="java.lang.String">
+        <constructor-arg
+                value="#{ systemProperties['SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY'] ?: (systemEnvironment['SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY'].endsWith(systemProperties['file.separator']) ? systemEnvironment['SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY'] : (systemEnvironment['SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY'] + systemProperties['file.separator'])) }"/>
+    </bean>
+
+    <!--exported to: eidas-specific-communication-definition module-->
+    <bean id="specificCommunicationConfigRepository" class="java.lang.String">
+        <constructor-arg
+                value="#{ specificProxyServiceConfigRepository }"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java b/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
index 82103095..c86fbd9b 100644
--- a/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
+++ b/ms_specific_proxyservice/src/test/java/at/asitplus/eidas/specific/proxy/test/FullStartUpAndProcessTest.java
@@ -79,7 +79,6 @@ import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
 import eu.eidas.auth.commons.light.ILightResponse;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 import eu.eidas.auth.commons.tx.BinaryLightToken;
-import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
 import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
 import lombok.SneakyThrows;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -131,8 +130,6 @@ public class FullStartUpAndProcessTest {
     //eIDAS Ref. Impl. properties
     System.setProperty("EIDAS_CONFIG_REPOSITORY", current.substring("file:".length())
         + "../basicConfig/eIDAS/");
-    System.setProperty("SPECIFIC_CONNECTOR_CONFIG_REPOSITORY", current.substring("file:".length())
-        + "../basicConfig/eIDAS/");
     System.setProperty("SPECIFIC_PROXY_SERVICE_CONFIG_REPOSITORY", current.substring("file:".length())
         + "../basicConfig/eIDAS/");
 
@@ -339,7 +336,7 @@ public class FullStartUpAndProcessTest {
   private void validateEidasLightResponse(String eidasNodeRespToken) {    
     final SpecificCommunicationService springManagedSpecificConnectorCommunicationService =
         (SpecificCommunicationService) wac.getBean(
-            SpecificCommunicationDefinitionBeanNames.SPECIFIC_PROXYSERVICE_COMMUNICATION_SERVICE.toString());
+            EidasConstants.SPECIFIC_PROXYSERVICE_COMMUNICATION_SERVICE);
     
     ILightResponse lightResp = springManagedSpecificConnectorCommunicationService.getAndRemoveResponse(eidasNodeRespToken, 
         attrRegistry.getCoreAttributeRegistry().getAttributes());
@@ -469,7 +466,7 @@ public class FullStartUpAndProcessTest {
     
     final SpecificCommunicationService springManagedSpecificConnectorCommunicationService =
         (SpecificCommunicationService) wac.getBean(
-            SpecificCommunicationDefinitionBeanNames.SPECIFIC_PROXYSERVICE_COMMUNICATION_SERVICE.toString());    
+            EidasConstants.SPECIFIC_PROXYSERVICE_COMMUNICATION_SERVICE.toString());
     BinaryLightToken token = springManagedSpecificConnectorCommunicationService.putRequest(authnReqBuilder.build());        
     proxyHttpReq.addParameter(EidasParameterKeys.TOKEN.toString(), Base64Utils.encodeToString(token.getTokenBytes()));