3 files changed, 15 insertions, 33 deletions
diff --git a/app/Core/Request.php b/app/Core/Request.php
index 5eda2d02..0398760e 100644
--- a/app/Core/Request.php
+++ b/app/Core/Request.php
@@ -8,7 +8,7 @@ namespace Kanboard\Core;
  * @package  core
  * @author   Frederic Guillot
  */
-class Request
+class Request extends Base
 {
     /**
      * Get URL string parameter
@@ -57,7 +57,8 @@ class Request
      */
     public function getValues()
     {
-        if (! empty($_POST) && Security::validateCSRFFormToken($_POST)) {
+        if (! empty($_POST) && ! empty($_POST['csrf_token']) && $this->token->validateCSRFToken($_POST['csrf_token'])) {
+            unset($_POST['csrf_token']);
             return $_POST;
         }
 
diff --git a/app/Core/Response.php b/app/Core/Response.php
index 528a6302..6788473a 100644
--- a/app/Core/Response.php
+++ b/app/Core/Response.php
@@ -8,7 +8,7 @@ namespace Kanboard\Core;
  * @package  core
  * @author   Frederic Guillot
  */
-class Response
+class Response extends Base
 {
     /**
      * Send no cache headers
diff --git a/app/Core/Security.php b/app/Core/Security/Token.php
index 54207ee1..7aca08af 100644
--- a/app/Core/Security.php
+++ b/app/Core/Security/Token.php
@@ -1,14 +1,16 @@
 <?php
 
-namespace Kanboard\Core;
+namespace Kanboard\Core\Security;
+
+use Kanboard\Core\Base;
 
 /**
- * Security class
+ * Token Handler
  *
- * @package  core
+ * @package  security
  * @author   Frederic Guillot
  */
-class Security
+class Token extends Base
 {
     /**
      * Generate a random token with different methods: openssl or /dev/urandom or fallback to uniqid()
@@ -17,7 +19,7 @@ class Security
      * @access public
      * @return string  Random token
      */
-    public static function generateToken()
+    public static function getToken()
     {
         if (function_exists('openssl_random_pseudo_bytes')) {
             return bin2hex(\openssl_random_pseudo_bytes(30));
@@ -31,18 +33,16 @@ class Security
     /**
      * Generate and store a CSRF token in the current session
      *
-     * @static
      * @access public
      * @return string  Random token
      */
-    public static function getCSRFToken()
+    public function getCSRFToken()
     {
-        $nonce = self::generateToken();
-
-        if (empty($_SESSION['csrf_tokens'])) {
+        if (! isset($_SESSION['csrf_tokens'])) {
             $_SESSION['csrf_tokens'] = array();
         }
 
+        $nonce = self::getToken();
         $_SESSION['csrf_tokens'][$nonce] = true;
 
         return $nonce;
@@ -51,12 +51,11 @@ class Security
     /**
      * Check if the token exists for the current session (a token can be used only one time)
      *
-     * @static
      * @access public
      * @param  string   $token   CSRF token
      * @return bool
      */
-    public static function validateCSRFToken($token)
+    public function validateCSRFToken($token)
     {
         if (isset($_SESSION['csrf_tokens'][$token])) {
             unset($_SESSION['csrf_tokens'][$token]);
@@ -65,22 +64,4 @@ class Security
 
         return false;
     }
-
-    /**
-     * Check if the token used in a form is correct and then remove the value
-     *
-     * @static
-     * @access public
-     * @param  array    $values   Form values
-     * @return bool
-     */
-    public static function validateCSRFFormToken(array &$values)
-    {
-        if (! empty($values['csrf_token']) && self::validateCSRFToken($values['csrf_token'])) {
-            unset($values['csrf_token']);
-            return true;
-        }
-
-        return false;
-    }
 }