[#453] Ignore unknown factors when calculating passing score in grace…

… mode
catalyst · Feb 15, 2024 · 2d036d6 · 2d036d6
1 parent 29963a6
commit 2d036d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/classes/manager.php b/classes/manager.php
@@ -812,9 +812,10 @@ public static function possible_factor_setup() {
     }
 
     /**
-     * Gets current user weight, up until first unknown factor.
+     * Gets current user weight
+     * @param bool $stoponunknown if true, will stop on the first unknown facotr.
      */
-    public static function get_cumulative_weight() {
+    public static function get_cumulative_weight($stoponunknown = true) {
         $factors = \tool_mfa\plugininfo\factor::get_active_user_factor_types();
         $totalweight = 0;
         foreach ($factors as $factor) {
@@ -824,7 +825,7 @@ public static function get_cumulative_weight() {
                 if ($totalweight >= 100) {
                     break;
                 }
-            } else if ($factor->get_state() == \tool_mfa\plugininfo\factor::STATE_UNKNOWN) {
+            } else if ($stoponunknown && $factor->get_state() == \tool_mfa\plugininfo\factor::STATE_UNKNOWN) {
                 break;
             }
         }

diff --git a/factor/grace/classes/factor.php b/factor/grace/classes/factor.php
@@ -135,7 +135,9 @@ public function get_state($redirectable = true) {
                             }
 
                             // We should never redirect if we have already passed.
-                            if ($redirectable && \tool_mfa\manager::get_cumulative_weight() >= 100) {
+                            // Do not stop on unknown, to avoid factors e.g. login banner from
+                            // hiding passing factors lower down in the list.
+                            if ($redirectable && \tool_mfa\manager::get_cumulative_weight(false) >= 100) {
                                 $redirectable = false;
                             }