Changed the way how to access database (#158)

Author: BaranekD

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 
 #### Changed
 - Use translation  for privacy policy document block on consent screen from module Perun
+- Connection to the database obtained through the SimpleSAML Database class
 
 #### Fixed
 - Fixed bad check in NagiosStatusConnector.php

hooks/hook_cron.php

@@ -1,10 +1,7 @@
 <?php
 
 use SimpleSAML\Logger;
-use SimpleSAML\Module\perun\DatabaseConnector;
-
-const TABLE_NAME = 'scriptChallenges';
-const DATE_COLUMN = 'date';
+use SimpleSAML\Module\perun\databaseCommand\ChallengesDbCmd;
 
 /**
  * Hook to run a cron job.
@@ -18,34 +15,11 @@ function challenges_hook_cron(&$croninfo)
         Logger::debug('cron [perun]: Skipping cron in cron tag [' . $croninfo['tag'] . '] ');
         return;
     }
-
     Logger::info('cron [perun]: Running cron in cron tag [' . $croninfo['tag'] . '] ');
 
-    try {
-        $databaseConnector = new DatabaseConnector();
-        $conn = $databaseConnector->getConnection();
-
-        if ($conn !== null) {
-            $stmt = $conn->prepare(
-                'DELETE FROM ' . TABLE_NAME . ' WHERE ' . DATE_COLUMN . ' < (NOW() - INTERVAL 5 MINUTE)'
-            );
-
-            if (!$stmt) {
-                $conn->close();
-                Logger::error('cron [perun]: Error during preparing statement');
-                return;
-            }
-
-            $ex = $stmt->execute();
-
-            if ($ex === false) {
-                Logger::error('cron [perun]: Error while deleting old challenges from the database.');
-            }
+    $challengesDbCmd = new ChallengesDbCmd();
 
-            $stmt->close();
-            $conn->close();
-        }
-    } catch (\Exception $e) {
-        $croninfo['summary'][] = 'Error while deleting old challenges from the database: ' . $e->getMessage();
+    if (!$challengesDbCmd->deleteOldChallenges()) {
+        Logger::error('cron [perun]: Error while deleting old challenges from the database.');
     }
 }

lib/ChallengeManager.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace SimpleSAML\Module\perun;
+
+use SimpleSAML\Logger;
+use SimpleSAML\Module\perun\databaseCommand\ChallengesDbCmd;
+
+class ChallengeManager
+{
+    const LOG_PREFIX = 'Perun:ChallengeManager: ';
+    private $challengeDbCmd;
+
+    public function __construct()
+    {
+        $this->challengeDbCmd = new ChallengesDbCmd();
+    }
+
+    public function insertChallenge($challenge, $id, $scriptName): bool
+    {
+        if (empty($challenge) ||
+            empty($id) ||
+            empty($scriptName) ||
+            !$this->challengeDbCmd->insertChallenge($challenge, $id, $scriptName)) {
+            Logger::error(self::LOG_PREFIX . 'Error while creating a challenge');
+            http_response_code(500);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function readChallengeFromDb($id)
+    {
+        if (empty($id)) {
+            http_response_code(400);
+            return null;
+        }
+
+        $result = $this->challengeDbCmd->readChallenge($id);
+
+        if ($result === null) {
+            http_response_code(500);
+        }
+
+        return $result;
+    }
+
+    public static function checkAccess($challenge, $challengeDb): bool
+    {
+        if (empty($challenge) || empty($challengeDb)) {
+            http_response_code(400);
+            return false;
+        }
+
+        if (!hash_equals($challengeDb, $challenge)) {
+            Logger::error(self::LOG_PREFIX . 'Hashes are not equal.');
+            http_response_code(401);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function deleteChallengeFromDb($id): bool
+    {
+        if (empty($id)) {
+            http_response_code(400);
+            return false;
+        }
+
+        if (!$this->challengeDbCmd->deleteChallenge($id)) {
+            Logger::error(self::LOG_PREFIX . 'Error while deleting challenge from the database.');
+            http_response_code(500);
+            return false;
+        }
+
+        return true;
+    }
+}