Merge branch 'nightlybuild' into feature/ms_proxy_service

3 files changed, 119 insertions, 9 deletions

diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
index 496158fa..6d08a731 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateOtherLoginMethodGuiTaskTest.java
@@ -29,6 +29,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
+import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SelectedLoginMethod;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask;
@@ -53,6 +54,8 @@ public class GenerateOtherLoginMethodGuiTaskTest {
   private static final String TEST_PATTER_REQ_PARAM =
       "<input type=\"hidden\" name=\"loginSelection\" value=\"{0}\">";
 
+  @Autowired MsConnectorDummyConfigMap config;
+  
   @Autowired
   GenerateOtherLoginMethodGuiTask task;
   
@@ -86,6 +89,9 @@ public class GenerateOtherLoginMethodGuiTaskTest {
 
     executionContext = new ExecutionContextImpl();
     
+    config.putConfigValue("auth.eIDAS.matching.byaddress.enable", "false");
+    
+    
     LocaleContextHolder.resetLocaleContext();
   }
 
@@ -172,6 +178,10 @@ public class GenerateOtherLoginMethodGuiTaskTest {
     assertNotNull("createNewErnpEntry", json.get(Constants.HTML_FORM_CREATE_NEW_ERNP_ENTRY));
     assertFalse("createNewErnpEntry", json.get(Constants.HTML_FORM_CREATE_NEW_ERNP_ENTRY).asBoolean());
     
+    assertNotNull("enableMatchingByAddressSearch", json.get(Constants.HTML_FORM_CREATE_NEW_ERNP_ENTRY));
+    assertFalse("enableMatchingByAddressSearch", json.get(Constants.HTML_FORM_CREATE_NEW_ERNP_ENTRY).asBoolean());
+    
+    
     assertNotNull("pendingRequest not stored", 
         storage.getPendingRequest(pendingReq.getPendingRequestId()));
     
@@ -199,10 +209,11 @@ public class GenerateOtherLoginMethodGuiTaskTest {
   @Test
   public void advancedMatchingFailedMsg() throws TaskExecutionException, UnsupportedEncodingException {
     executionContext.put(Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED, true);
-
+    config.putConfigValue("auth.eIDAS.matching.byaddress.enable", "true");
+    
     task.execute(pendingReq, executionContext);
         
-    String html = doBasicValidation();
+    String html = doBasicValidation(true);
     Assert.assertFalse("Missing eIDAS infos",
         html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.ADD_ME_AS_NEW)));
     Assert.assertTrue("missing errorfield",
@@ -218,7 +229,7 @@ public class GenerateOtherLoginMethodGuiTaskTest {
     
     task.execute(pendingReq, executionContext);
 
-    String html = doBasicValidation();
+    String html = doBasicValidation(false);
     Assert.assertTrue("missing errorfield",
         html.contains("<div id=\"matchingError\""));
     Assert.assertTrue("missing errorfield",
@@ -231,7 +242,7 @@ public class GenerateOtherLoginMethodGuiTaskTest {
 
     task.execute(pendingReq, executionContext);
 
-    doBasicValidation();
+    doBasicValidation(false);
 
   }
 
@@ -242,7 +253,7 @@ public class GenerateOtherLoginMethodGuiTaskTest {
 
     task.execute(pendingReq, executionContext);
 
-    doBasicValidation();
+    doBasicValidation(false);
 
   }
 
@@ -252,7 +263,7 @@ public class GenerateOtherLoginMethodGuiTaskTest {
 
     task.execute(pendingReq, executionContext);
 
-    doBasicValidation();
+    doBasicValidation(false);
 
   }
 
@@ -263,11 +274,11 @@ public class GenerateOtherLoginMethodGuiTaskTest {
 
     task.execute(pendingReq, executionContext);
 
-    doBasicValidation();
+    doBasicValidation(false);
 
   }
 
-  private String doBasicValidation() throws UnsupportedEncodingException {
+  private String doBasicValidation(boolean addressSearchAllowed) throws UnsupportedEncodingException {
     Assert.assertEquals("Wrong http StatusCode", 200, httpResp.getStatus());
     Assert.assertEquals("Wrong http ContentType", "text/html;charset=UTF-8", httpResp.getContentType());
 
@@ -278,7 +289,8 @@ public class GenerateOtherLoginMethodGuiTaskTest {
     Assert.assertTrue("Missing IDA Login",
         html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.MOBILE_PHONE_SIGNATURE_LOGIN)));
     Assert.assertTrue("Missing residence infos",
-        html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.NO_OTHER_LOGIN)));
+        html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, 
+            addressSearchAllowed ? SelectedLoginMethod.NO_OTHER_LOGIN : SelectedLoginMethod.REQUESTING_NEW_ENTRY)));
     Assert.assertTrue("Missing eIDAS infos",
         html.contains(MessageFormat.format(TEST_PATTER_REQ_PARAM, SelectedLoginMethod.EIDAS_LOGIN)));
         
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
index 750a17ce..66867fce 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveOtherLoginMethodGuiResponseTaskTest.java
@@ -4,6 +4,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
@@ -21,9 +23,11 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SelectedLoginMethod;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveOtherLoginMethodGuiResponseTask;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
@@ -37,6 +41,8 @@ import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 @WebAppConfiguration
 public class ReceiveOtherLoginMethodGuiResponseTaskTest {
 
+  @Autowired MsConnectorDummyConfigMap config;
+  
   @Autowired
   private ReceiveOtherLoginMethodGuiResponseTask task;
 
@@ -68,10 +74,22 @@ public class ReceiveOtherLoginMethodGuiResponseTaskTest {
     pendingReq.setAuthUrl("https://localhost/ms_connector");
     pendingReq.setPendingReqId(RandomStringUtils.randomAlphanumeric(10));
 
+    config.putConfigValue("auth.eIDAS.matching.byaddress.enable", "false");
+    
     LocaleContextHolder.resetLocaleContext();
   }
 
   @Test
+  public void withStopMatchingSelection() throws TaskExecutionException {
+httpReq.setParameter(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER,  SelectedLoginMethod.STOP_MATCHING_PROCESS.name());
+    
+    task.execute(pendingReq, executionContext);
+    
+    assertTrue("stoppedByUser", pendingReq.isAbortedByUser());
+    
+  }
+  
+  @Test
   public void withMobileSignatureSelection() throws TaskExecutionException {
     testTransition(SelectedLoginMethod.MOBILE_PHONE_SIGNATURE_LOGIN, Constants.TRANSITION_TO_GENERATE_MOBILE_PHONE_SIGNATURE_REQUEST_TASK);
     assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
@@ -87,18 +105,40 @@ public class ReceiveOtherLoginMethodGuiResponseTaskTest {
 
   @Test
   public void withNoOtherLoginSelection() throws TaskExecutionException {
+    config.putConfigValue("auth.eIDAS.matching.byaddress.enable", "true");
+    
     testTransition(SelectedLoginMethod.NO_OTHER_LOGIN, Constants.TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK);
     assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
     
   }
 
   @Test
+  public void withNoOtherLoginSelectionDisabled() throws TaskExecutionException {    
+    httpReq.setParameter(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER,  SelectedLoginMethod.NO_OTHER_LOGIN.name());
+    
+    TaskExecutionException error = assertThrows("wrong exception", TaskExecutionException.class,
+        () -> task.execute(pendingReq, executionContext));
+    
+    assertEquals("wrong errorCode", "module.eidasauth.matching.98",  
+        ((EaafException) error.getOriginalException()).getErrorId());
+    
+  }
+  
+  @Test
   public void withAddMeAsNewSelection() throws TaskExecutionException {
     testTransition(SelectedLoginMethod.ADD_ME_AS_NEW, Constants.TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK);
     assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
     
   }
 
+  @Test
+  public void withRequestingNewEntrySelection() throws TaskExecutionException {
+    testTransition(SelectedLoginMethod.REQUESTING_NEW_ENTRY, Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK);
+    assertEquals("return to selection", true, executionContext.get(Constants.TRANSITION_TO_REQUESTING_NEW_ERNP_ENTRY_TASK));
+    assertEquals("return to selection", false, executionContext.get(Constants.TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK));
+    
+  }
+  
   public void testTransition(SelectedLoginMethod loginMethod, String expectedTransition) throws TaskExecutionException {
     httpReq.setParameter(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER, loginMethod.name());
     executionContext.put(Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED, true);
@@ -109,6 +149,8 @@ public class ReceiveOtherLoginMethodGuiResponseTaskTest {
     assertFalse("wrong process-cancelled flag", executionContext.isProcessCancelled());
     assertNotNull("no login-selection found", executionContext.get(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER));
     assertEquals("Wrong login-selection found", loginMethod.name(), executionContext.get(Constants.REQ_SELECTED_LOGIN_METHOD_PARAMETER));
+    
+    
     assertEquals("Next task", true, executionContext.get(expectedTransition));
     assertNull("find advancedMatchingError flag", executionContext.get(Constants.CONTEXT_FLAG_ADVANCED_MATCHING_FAILED));
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/utils/AddressSearchResultTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/utils/AddressSearchResultTest.java
new file mode 100644
index 00000000..fef157db
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/utils/AddressSearchResultTest.java
@@ -0,0 +1,56 @@
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.utils;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.mockito.internal.util.collections.Sets;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.controller.AdresssucheController.AdresssucheOutput;
+
+@RunWith(BlockJUnit4ClassRunner.class)
+public class AddressSearchResultTest {
+  
+  @Test
+  public void checkNumbers() {
+    
+    Set<AdresssucheOutput> result = Sets.newSet(
+        buildRandom("2"),
+        buildRandom("3"),
+        buildRandom("1"),
+        buildRandom("10"),
+        buildRandom(null),
+        buildRandom("10-12"),
+        buildRandom("15")
+        );
+    
+    final List<String> sorted = result.stream().sorted().limit(30)
+        .map(el -> el.getNumber())        
+        .collect(Collectors.toList());
+
+    
+    assertArrayEquals("wrong order", 
+        new Object[]{null, "1", "2", "3", "10", "15", "10-12"},        
+        sorted.toArray());
+    
+    
+            
+    
+  }
+
+  private AdresssucheOutput buildRandom(String number) {
+    return AdresssucheOutput.builder()
+        .municipality("aaaaaaaa")
+        .postleitzahl("8080")
+        .street("bbbbb")
+        .number(number)
+        .village("cccccc")
+        .build();
+   }
+
+}