refactor: 💡 Refactored PullRequest

Author: Dominik Frantisek Bucik

lib/Auth/Process/RestoreAcrs.php lib/Auth/Process/MultifactorAcrs.phplib/Auth/Process/RestoreAcrs.php renamed to lib/Auth/Process/MultifactorAcrs.php

@@ -14,7 +14,7 @@
  * failing. As a result, we then get modified requested ACRs, which should be restored to the previous (original) state
  * using this authproc filter. It should be run on one of the first places of the IdP authproc chain.
  */
-class RestoreAcrs extends ProcessingFilter
+class MultifactorAcrs extends ProcessingFilter
 {
     public const CONFIG_FILE_NAME = 'module_perun.php';
 
@@ -30,7 +30,7 @@ public function process(&$request)
         $this->restoreAcrs($request);
     }
 
-    public static function storeAcrs(array &$state, array $acrsToAdd)
+    public static function addAndStoreAcrs(array &$state, array $acrsToAdd)
     {
         if (!empty($acrsToAdd)
             && !empty($state[Disco::SAML_REQUESTED_AUTHN_CONTEXT][Disco::STATE_AUTHN_CONTEXT_CLASS_REF])
@@ -70,10 +70,13 @@ private function restoreAcrs(&$request)
     {
         if (!empty($request[Disco::SAML_REQUESTED_AUTHN_CONTEXT_ORIGINAL])) {
             unset($request[Disco::SAML_REQUESTED_AUTHN_CONTEXT][Disco::STATE_AUTHN_CONTEXT_CLASS_REF]);
-            $handle = &$request[Disco::SAML_REQUESTED_AUTHN_CONTEXT][Disco::STATE_AUTHN_CONTEXT_CLASS_REF];
-            $handle = $request[Disco::SAML_REQUESTED_AUTHN_CONTEXT_ORIGINAL];
+            $request[Disco::SAML_REQUESTED_AUTHN_CONTEXT][Disco::STATE_AUTHN_CONTEXT_CLASS_REF] =
+                $request[Disco::SAML_REQUESTED_AUTHN_CONTEXT_ORIGINAL];
             unset($request[Disco::SAML_REQUESTED_AUTHN_CONTEXT_ORIGINAL]);
-            Logger::debug(self::DEBUG_PREFIX . ': ACRS restored: ' . join(',', $handle));
+            Logger::debug(
+                self::DEBUG_PREFIX . ': ACRS restored: '
+                . join(',', $request[Disco::SAML_REQUESTED_AUTHN_CONTEXT][Disco::STATE_AUTHN_CONTEXT_CLASS_REF])
+            );
         }
     }
 }

lib/Disco.php

@@ -10,6 +10,7 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Module\discopower\PowerIdPDisco;
+use SimpleSAML\Module\perun\Auth\Process\MultifactorAcrs;
 use SimpleSAML\Module\perun\model\WarningConfiguration;
 use SimpleSAML\Utils\HTTP;
 
@@ -991,6 +992,6 @@ private function fillSpNameForSaml($t)
     private function prepareAcrsForMfa(array &$state)
     {
         $contextsToAdd = $this->wayfConfiguration->getArray(self::ADD_AUTHN_CONTEXT_CLASSES_FOR_MFA, []);
-        Module\perun\Auth\Process\RestoreAcrs::storeAcrs($state, $contextsToAdd);
+        MultifactorAcrs::addAndStoreAcrs($state, $contextsToAdd);
     }
 }