MID-9178: fix for finish of authentication sequence when use more suf…

…ficient modules and first is successfull
Evolveum · Oct 5, 2023 · 1153b1c · 1153b1c
1 parent 582d946
commit 1153b1c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 135 deletions.
diff --git a/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java b/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java
@@ -382,7 +382,36 @@ private boolean allModulesAreAuthenticated() {
     public boolean isFinished() {
         int actualSize = getAuthentications().size();
         int endSize = getAuthModules().size();
-        return processingModuleIsRequisiteAndFailure() || (actualSize == endSize && allModulesAreProcessed());
+        return successfulProcessedSufficientModule() || processingModuleIsRequisiteAndFailure() || (actualSize == endSize && allModulesAreProcessed());
+    }
+
+    private boolean successfulProcessedSufficientModule() {
+        boolean successOneSufficientModule = false;
+
+        for (AuthenticationSequenceModuleType module : getSequence().getModule()) {
+            if (AuthenticationSequenceModuleNecessityType.REQUISITE == module.getNecessity()
+                    || AuthenticationSequenceModuleNecessityType.OPTIONAL == module.getNecessity()) {
+                continue;
+            }
+            if (AuthenticationSequenceModuleNecessityType.REQUIRED == module.getNecessity()) {
+                ModuleAuthentication authentication = getAuthenticationByIdentifier(module);
+                if (authentication == null
+                        || AuthenticationModuleState.SUCCESSFULLY != authentication.getState()) {
+                    return false;
+                }
+            }
+            if (AuthenticationSequenceModuleNecessityType.SUFFICIENT == module.getNecessity()) {
+                ModuleAuthentication authentication = getAuthenticationByIdentifier(module);
+                if (authentication == null) {
+                    continue;
+                }
+                if (AuthenticationModuleState.SUCCESSFULLY == authentication.getState()) {
+                    successOneSufficientModule = true;
+                }
+            }
+        }
+
+        return successOneSufficientModule;
     }
 
     private boolean processingModuleIsRequisiteAndFailure() {

diff --git a/...src/main/java/com/evolveum/midpoint/authentication/impl/filter/OncePerSequenceFilter.java b/...src/main/java/com/evolveum/midpoint/authentication/impl/filter/OncePerSequenceFilter.java