refactor: extract restoreHash() method

Author: kenjis

system/Security/Security.php

@@ -502,6 +502,21 @@ public function sanitizeFilename(string $str, bool $relativePath = false): strin
         return stripslashes($str);
     }
 
+    /**
+     * Restore hash from Session or Cookie
+     */
+    private function restoreHash(): void
+    {
+        if ($this->isCSRFCookie()) {
+            if ($this->isHashInCookie()) {
+                $this->hash = $this->hashInCookie;
+            }
+        } elseif ($this->session->has($this->tokenName)) {
+            // Session based CSRF protection
+            $this->hash = $this->session->get($this->tokenName);
+        }
+    }
+
     /**
      * Generates the CSRF Hash.
      */
@@ -511,13 +526,10 @@ protected function generateHash(): string
         // We don't necessarily want to regenerate it with
         // each page load since a page could contain embedded
         // sub-pages causing this feature to fail
-        if ($this->isCSRFCookie()) {
-            if ($this->isHashInCookie()) {
-                return $this->hash = $this->hashInCookie;
-            }
-        } elseif ($this->session->has($this->tokenName)) {
-            // Session based CSRF protection
-            return $this->hash = $this->session->get($this->tokenName);
+        $this->restoreHash();
+
+        if ($this->hash !== null) {
+            return $this->hash;
         }
 
         $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES));