add country specific pre-processing to build country specific eIDAS requests

6 files changed, 248 insertions, 6 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
index 7ae30845..363eff85 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
@@ -79,7 +79,7 @@ import szrservices.SZRException_Exception;
 import szrservices.TravelDocumentType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/SpringTest-context_basic_test.xml")
+@ContextConfiguration("/SpringTest-context_tasks_test.xml")
 public class SZRClientTest {
 	private static final Logger log = LoggerFactory.getLogger(SZRClientTest.class);
 	
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
index df2920cb..2b19e1e2 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASAttributePostProcessingTest.java
@@ -34,18 +34,21 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.EIDPostProcessingService;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("/SpringTest-context_basic_test.xml")
+@ContextConfiguration("/SpringTest-context_tasks_test.xml")
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 public class eIDASAttributePostProcessingTest {
 	
-	@Autowired private EIDPostProcessingService postProcessor; 
+	@Autowired private CCSpecificEIDProcessingService postProcessor; 
 	
 	//lower case
 	private static final String P1_eIDASID = "DE/AT/532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
new file mode 100644
index 00000000..35d8a760
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
+import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
+import eu.eidas.auth.commons.light.impl.LightRequest;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/SpringTest-context_tasks_test.xml")
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class eIDASRequestPreProcessingFirstTest {
+
+	@Autowired private IConfigurationWithSP basicConfig;
+	@Autowired private CCSpecificEIDProcessingService preProcessor; 
+
+	private TestRequestImpl pendingReq;
+	private DummySPConfiguration oaParam;
+	private Builder authnRequestBuilder;
+
+	
+	@BeforeClass
+	public static void classInitializer() throws IOException {
+		final String current = new java.io.File( "." ).toURI().toString();
+		System.setProperty("eidas.ms.configuration", current + "../../basicConfig/default_config.properties");
+       
+	}
+		
+	@Before
+	public void setUp() {
+			
+		Map<String, String> spConfig = new HashMap<>();
+		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
+		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+				
+		pendingReq = new TestRequestImpl();
+		pendingReq.setSpConfig(oaParam);
+		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
+		pendingReq.setAuthURL("http://test.com/");
+		
+		authnRequestBuilder = LightRequest.builder();
+		authnRequestBuilder.id(UUID.randomUUID().toString());
+		authnRequestBuilder.issuer("Test");
+		
+	}
+	
+	@Test
+	public void prePreProcessGeneric() throws eIDPostProcessingException {		
+		String testCountry = "XX";
+		authnRequestBuilder.citizenCountryCode(testCountry);		
+		preProcessor.preProcess(testCountry, pendingReq, authnRequestBuilder);
+			
+		LightRequest lightReq = authnRequestBuilder.build();
+		
+		Assert.assertEquals("ProviderName is not Static", Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, lightReq.getProviderName());
+		Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+		Assert.assertEquals("Requested attribute size not match", 4, lightReq.getRequestedAttributes().size());
+						
+	}
+	
+	@Test
+	public void prePreProcessGenericNoCountryCode() throws eIDPostProcessingException {
+		String testCountry = "XX";
+		authnRequestBuilder.citizenCountryCode(testCountry);					
+		preProcessor.preProcess(null, pendingReq, authnRequestBuilder);
+			
+		LightRequest lightReq = authnRequestBuilder.build();
+		
+		Assert.assertEquals("ProviderName is not Static", Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, lightReq.getProviderName());
+		Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+		Assert.assertEquals("Requested attribute size not match", 4, lightReq.getRequestedAttributes().size());
+				
+	}
+	
+	@Test
+	public void prePreProcessDE() throws eIDPostProcessingException {
+			
+		String testCountry = "DE";
+		authnRequestBuilder.citizenCountryCode(testCountry);		
+		preProcessor.preProcess(testCountry, pendingReq, authnRequestBuilder);
+			
+		LightRequest lightReq = authnRequestBuilder.build();
+		
+		Assert.assertEquals("ProviderName is not Static", Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, lightReq.getProviderName());
+		Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+		Assert.assertEquals("Requested attribute size not match", 8, lightReq.getRequestedAttributes().size());
+				
+	}
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
new file mode 100644
index 00000000..ababbd04
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
+import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
+import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
+import eu.eidas.auth.commons.light.impl.LightRequest;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/SpringTest-context_tasks_test.xml")
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+public class eIDASRequestPreProcessingSecondTest {
+
+	@Autowired private IConfigurationWithSP basicConfig;
+	@Autowired private CCSpecificEIDProcessingService preProcessor; 
+
+	private TestRequestImpl pendingReq;
+	private DummySPConfiguration oaParam;
+	private Builder authnRequestBuilder;
+
+	
+	@BeforeClass
+	public static void classInitializer() throws IOException {
+		final String current = new java.io.File( "." ).toURI().toString();
+		System.setProperty("eidas.ms.configuration", current + "src/test/resources/config/junit_config_1.properties");
+       
+	}
+		
+	@Before
+	public void setUp() {
+			
+		Map<String, String> spConfig = new HashMap<>();
+		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
+		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+				
+		pendingReq = new TestRequestImpl();
+		pendingReq.setSpConfig(oaParam);
+		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
+		pendingReq.setAuthURL("http://test.com/");
+		
+		authnRequestBuilder = LightRequest.builder();
+		authnRequestBuilder.id(UUID.randomUUID().toString());
+		authnRequestBuilder.issuer("Test");
+		
+	}
+		
+	@Test
+	public void prePreProcessDEUnknownAttribute() throws eIDPostProcessingException {
+			
+		String testCountry = "DE";
+		authnRequestBuilder.citizenCountryCode(testCountry);		
+		preProcessor.preProcess(testCountry, pendingReq, authnRequestBuilder);
+			
+		LightRequest lightReq = authnRequestBuilder.build();
+		
+		Assert.assertEquals("ProviderName is not Static", "myNode", lightReq.getProviderName());
+		Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+		Assert.assertEquals("Requested attribute size not match", 8, lightReq.getRequestedAttributes().size());
+				
+	}
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
index 342ef424..3ef983a9 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -36,7 +37,7 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("/SpringTest-context_tasks_test.xml")
-@DirtiesContext
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
 public class GenerateAuthnRequestTaskFirstTest {
 
 	@Autowired(required=true) private GenerateAuthnRequestTask task;
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
index cf2de754..da4be714 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -33,7 +34,7 @@ import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration("/SpringTest-context_tasks_test.xml")
-@DirtiesContext
+@DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
 public class GenerateAuthnRequestTaskThirdTest {
 
 	@Autowired(required=true) private GenerateAuthnRequestTask task;