Merge pull request 'check session validity by DatabaseSessionHandler' (#16) from feature/sessions-should-expire into master

Reviewed-on: #16

dummy.php

@@ -3,12 +3,3 @@
 require 'vendor/autoload.php';
 
 const ROOT = __DIR__;
-
-class Container
-{
-    static SokoWeb\Interfaces\Database\IConnection $dbConnection;
-    static SokoWeb\Interfaces\Database\IAuditLogger $auditLogger;
-    static SokoWeb\Routing\RouteCollection $routeCollection;
-    static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
-    static SokoWeb\Interfaces\Request\IRequest $request;
-}

src/Database/Query/Select.php

@@ -276,13 +276,12 @@ class Select
             return [(string) $table, $params];
         }
 
-        if ($table instanceof Select)
+        if ($table instanceof Select) {
-        {
             return $table->generateQuery();
         }
 
         if (isset($this->tableAliases[$table])) {
-            $queryString = ($defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table));
+            $queryString = $defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table);
             return [$queryString, $params];
         }
 
@@ -295,24 +294,17 @@ class Select
             return (string) $column;
         }
 
-        if (is_array($column)) {
+        if (!is_array($column)) {
-            $out = '';
+            $column = [$this->table, $column];
-
-            if ($column[0]) {
-                list($tableName, $params) = $this->generateTable($column[0]);
-                $out .= $tableName . '.';
-            }
-
-            $out .= Utils::backtick($column[1]);
-
-            if (!empty($column[2])) {
-                $out .= ' ' . Utils::backtick($column[2]);
-            }
-
-            return $out;
-        } else {
-            return Utils::backtick($column);
         }
+
+        list($tableName, $params) = $this->generateTable($column[0]);
+        $out = $tableName . '.' . Utils::backtick($column[1]);
+        if (!empty($column[2])) {
+            $out .= ' ' . Utils::backtick($column[2]);
+        }
+
+        return $out;
     }
 
     private function generateColumns(): string

src/Interfaces/PersistentData/IPersistentDataManager.php

@@ -0,0 +1,20 @@
+<?php namespace SokoWeb\Interfaces\PersistentData;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\PersistentData\Model\Model;
+
+interface IPersistentDataManager
+{
+    public function selectFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []);
+
+    public function selectMultipleFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Generator;
+
+    public function selectFromDbById($id, string $type, bool $useRelations = false, array $withRelations = []);
+
+    public function loadRelationsFromDb(Model $model, bool $recursive = false, array $withRelations = []): void;
+
+    public function saveToDb(Model $model): void;
+
+    public function deleteFromDb(Model $model): void;
+}

src/Interfaces/Request/IRequest.php

@@ -4,7 +4,7 @@ use SokoWeb\Interfaces\Authentication\IUser;
 
 interface IRequest
 {
-    public function setParsedRouteParams(array &$routeParams): void;
+    public function setParsedRouteParams(array $routeParams): void;
 
     public function getBase(): string;
 

src/Interfaces/Response/IRedirect.php

@@ -6,7 +6,7 @@ interface IRedirect
 
     const TEMPORARY = 2;
 
-    public function getUrl(): string;
+    public function getTarget(): string;
 
     public function getHttpCode(): int;
 }

src/Interfaces/Routing/IRoute.php

@@ -0,0 +1,12 @@
+<?php namespace SokoWeb\Interfaces\Routing;
+
+interface IRoute
+{
+    public function getId(): string;
+
+    public function getHandler(): array;
+
+    public function generateLink(array $parameters = []): string;
+
+    public function testAgainst(array $path): ?array;
+}

src/Interfaces/Routing/IRouteCollection.php

@@ -0,0 +1,16 @@
+<?php namespace SokoWeb\Interfaces\Routing;
+
+use Closure;
+
+interface IRouteCollection
+{
+    public function get(string $id, string $pattern, array $handler): void;
+
+    public function post(string $id, string $pattern, array $handler): void;
+
+    public function group(string $pattern, Closure $group): void;
+
+    public function getRoute(string $id): ?IRoute;
+
+    public function match(string $method, string $uri): ?array;
+}

src/PersistentData/PersistentDataManager.php

@@ -3,11 +3,24 @@
 use Generator;
 use SokoWeb\Database\Query\Modify;
 use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IConnection;
+use SokoWeb\Interfaces\Database\IAuditLogger;
 use SokoWeb\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\PersistentData\IPersistentDataManager;
 use SokoWeb\PersistentData\Model\Model;
 
-class PersistentDataManager
+class PersistentDataManager implements IPersistentDataManager
 {
+    private IConnection $dbConnection;
+
+    private ?IAuditLogger $auditLogger;
+
+    public function __construct(IConnection $dbConnection, ?IAuditLogger $auditLogger = null)
+    {
+        $this->dbConnection = $dbConnection;
+        $this->auditLogger = $auditLogger;
+    }
+
     public function selectFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = [])
     {
         $select = $this->createSelect($select, $type, $useRelations, $withRelations);
@@ -37,64 +50,22 @@ class PersistentDataManager
         }
     }
 
-    public function selectFromDbById($id, string $type, bool $useRelations = false)
+    public function selectFromDbById($id, string $type, bool $useRelations = false, array $withRelations = [])
     {
-        $select = new Select(\Container::$dbConnection);
+        $select = new Select($this->dbConnection);
         $select->whereId($id);
 
-        return $this->selectFromDb($select, $type, $useRelations);
+        return $this->selectFromDb($select, $type, $useRelations, $withRelations);
     }
 
-    public function fillWithData(array &$data, Model $model, array $withRelations = [], ?string $modelKey = null): void
+    public function loadRelationsFromDb(Model $model, bool $recursive = false, array $withRelations = []): void
     {
         $relations = $model::getRelations();
         if (count($withRelations)) {
-            $relations = array_intersect($relations, $withRelations);
+            $relations = array_intersect_key($relations, array_flip($withRelations));
         }
 
-        while (key($data)) {
+        foreach ($relations as $relation => $relationType) {
-            $key = key($data);
-            $value = current($data);
-            $relation = key($relations);
-
-            if (strpos($key, '__') === false) {
-                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-                if (method_exists($model, $method) && isset($value)) {
-                    $model->$method($value);
-                }
-
-                next($data);
-            } else if (isset($modelKey) && substr($key, 0, strlen($modelKey . '__')) === $modelKey . '__') {
-                $key = substr($key, strlen($modelKey) + 2);
-
-                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-                if (method_exists($model, $method) && isset($value)) {
-                    $model->$method($value);
-                }
-
-                next($data);
-            } else if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
-                $relationType = current($relations);
-                $relationModel = new $relationType();
-                $this->fillWithData($data, $relationModel, $withRelations, $relation);
-
-                $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
-                $model->$method($relationModel);
-
-                next($relations);
-            } else {
-                return;
-            }
-        }
-
-        $model->saveSnapshot();
-    }
-
-    public function loadRelationsFromDb(Model $model, bool $recursive): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
             $camel = str_replace('_', '', ucwords($relation, '_'));
 
             $methodGet = 'get' . $camel . 'Id';
@@ -103,7 +74,7 @@ class PersistentDataManager
             $relationId = $model->$methodGet();
 
             if ($relationId !== null) {
-                $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive);
+                $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive, $withRelations);
 
                 $model->$methodSet($relationModel);
             }
@@ -117,7 +88,7 @@ class PersistentDataManager
         $modified = $model->toArray();
         $id = $model->getId();
 
-        $modify = new Modify(\Container::$dbConnection, $model::getTable(), \Container::$auditLogger);
+        $modify = new Modify($this->dbConnection, $model::getTable(), $this->auditLogger);
 
         if ($id !== null) {
             $original = $model->getSnapshot();
@@ -149,7 +120,7 @@ class PersistentDataManager
 
     public function deleteFromDb(Model $model): void
     {
-        $modify = new Modify(\Container::$dbConnection, $model::getTable(), \Container::$auditLogger);
+        $modify = new Modify($this->dbConnection, $model::getTable(), $this->auditLogger);
         $modify->setId($model->getId());
         $modify->fill($model->toArray());
         $modify->delete();
@@ -174,10 +145,10 @@ class PersistentDataManager
         if ($useRelations) {
             $relations = call_user_func([$type, 'getRelations']);
             if (count($withRelations)) {
-                $relations = array_intersect($relations, $withRelations);
+                $relations = array_intersect_key($relations, array_flip($withRelations));
             }
 
-            $columns = array_merge($columns, $this->getRelationColumns($relations, $withRelations));
+            $columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations));
 
             $this->leftJoinRelations($select, $table, $relations, $withRelations);
             $select->columns($columns);
@@ -188,21 +159,22 @@ class PersistentDataManager
         return $select;
     }
 
-    private function getRelationColumns(array $relations, array $withRelations): array
+    private function getRelationColumns(string $table, array $relations, array $withRelations): array
     {
         $columns = [];
 
         foreach ($relations as $relation => $relationType) {
+            $relationTableAlias = $table . '__' . $relation;
             $relationTable = call_user_func([$relationType, 'getTable']);
             foreach (call_user_func([$relationType, 'getFields']) as $relationField) {
-                $columns[] = [$relationTable, $relationField, $relation . '__' . $relationField];
+                $columns[] = [$relationTableAlias, $relationField, $relation . '__' . $relationField];
             }
 
-            $nextOrderRelations = call_user_func([$relationType, 'getRelations']);
+            $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
             if (count($withRelations)) {
-                $nextOrderRelations = array_intersect($nextOrderRelations, $withRelations);
+                $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
             }
-            $columns = array_merge($columns, $this->getRelationColumns($nextOrderRelations, $withRelations));
+            $columns = array_merge($columns, $this->getRelationColumns($relationTable, $relationsOfRelation, $withRelations));
         }
 
         return $columns;
@@ -211,17 +183,70 @@ class PersistentDataManager
     private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void
     {
         foreach ($relations as $relation => $relationType) {
+            $relationTableAlias = $table . '__' . $relation;
             $relationTable = call_user_func([$relationType, 'getTable']);
-            $select->leftJoin($relationTable, [$relationTable, 'id'], '=', [$table, $relation . '_id']);
+            $select->setTableAliases([$relationTableAlias => $relationTable]);
+            $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$table, $relation . '_id']);
 
-            $nextOrderRelations = call_user_func([$relationType, 'getRelations']);
+            $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
             if (count($withRelations)) {
-                $nextOrderRelations = array_intersect($nextOrderRelations, $withRelations);
+                $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
             }
-            $this->leftJoinRelations($select, $relationTable, $nextOrderRelations, $withRelations);
+            $this->leftJoinRelations($select, $relationTable, $relationsOfRelation, $withRelations);
         }
     }
 
+    private function fillWithData(array &$data, Model $model, array $withRelations = [], ?string $modelKey = null): void
+    {
+        $relations = $model::getRelations();
+        if (count($withRelations)) {
+            $relations = array_intersect_key($relations, array_flip($withRelations));
+        }
+
+        while (key($data)) {
+            $key = key($data);
+            $value = current($data);
+            $relation = key($relations);
+
+            if (strpos($key, '__') === false) {
+                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
+
+                if (method_exists($model, $method) && isset($value)) {
+                    $model->$method($value);
+                }
+
+                next($data);
+            } else if (isset($modelKey) && substr($key, 0, strlen($modelKey . '__')) === $modelKey . '__') {
+                $key = substr($key, strlen($modelKey) + 2);
+
+                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
+
+                if (method_exists($model, $method) && isset($value)) {
+                    $model->$method($value);
+                }
+
+                next($data);
+            } else if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
+                if ($data[$relation . '__id'] !== null) {
+                    $relationType = current($relations);
+                    $relationModel = new $relationType();
+                    $this->fillWithData($data, $relationModel, $withRelations, $relation);
+
+                    $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
+                    $model->$method($relationModel);
+                } else {
+                    next($data);
+                }
+
+                next($relations);
+            } else {
+                return;
+            }
+        }
+
+        $model->saveSnapshot();
+    }
+
     private function syncRelations(Model $model): void
     {
         foreach ($model::getRelations() as $relation => $relationType) {

src/Request/Request.php

@@ -17,23 +17,23 @@ class Request implements IRequest
 
     private array $headers;
 
-    private Session $session;
+    private ISession $session;
 
     private ?IUser $user = null;
 
     public function __construct(
         string $base,
-        array &$get,
+        array $get,
-        array &$post,
+        array $post,
         array $headers,
-        array &$session,
+        ISession $session,
         IUserRepository $userRepository)
     {
         $this->base = $base;
-        $this->get = &$get;
+        $this->get = $get;
-        $this->post = &$post;
+        $this->post = $post;
         $this->headers = $headers;
-        $this->session = new Session($session);
+        $this->session = $session;
 
         $userId = $this->session->get('userId');
         if ($userId !== null) {
@@ -41,9 +41,9 @@ class Request implements IRequest
         }
     }
 
-    public function setParsedRouteParams(array &$routeParams): void
+    public function setParsedRouteParams(array $routeParams): void
     {
-        $this->routeParams = &$routeParams;
+        $this->routeParams = $routeParams;
     }
 
     public function getBase(): string

src/Response/HttpResponse.php

@@ -64,7 +64,7 @@ class HttpResponse
         list($route, $params) = $match;
         $this->request->setParsedRouteParams($params);
         $handler = $route->getHandler();
-        $controller = new $handler[0]($this->request);
+        $controller = new $handler[0]();
 
         if (
             $controller instanceof IAuthenticationRequired &&
@@ -103,7 +103,7 @@ class HttpResponse
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
             $response->render();
         } elseif ($response instanceof IRedirect) {
-            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+            header('Location: ' . $this->getRedirectUrl($response), true, $response->getHttpCode());
         } else {
             $this->render404();
         }
@@ -113,7 +113,7 @@ class HttpResponse
     {
         $this->request->session()->set('redirect_after_login', $this->rawUrl);
         $response = new Redirect($this->routeCollection->getRoute($this->appConfig['loginRouteId'])->generateLink(), IRedirect::TEMPORARY);
-        header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+        header('Location: ' . $this->getRedirectUrl($response), true, $response->getHttpCode());
     }
 
     private function renderAntiCsrfError(): void
@@ -142,4 +142,13 @@ class HttpResponse
         header('Content-Type: text/html; charset=UTF-8', true, 500);
         $content->render();
     }
+
+    private function getRedirectUrl(IRedirect $redirect): string
+    {
+        $url = $redirect->getTarget();
+        if (preg_match('/^http(s)?/', $url) !== 1) {
+            $url = $this->request->getBase() . $url;
+        }
+        return $url;
+    }
 }

src/Response/Redirect.php

@@ -14,15 +14,9 @@ class Redirect implements IRedirect
         $this->type = $type;
     }
 
-    public function getUrl(): string
+    public function getTarget(): string
     {
-        if (preg_match('/^http(s)?/', $this->target) === 1) {
+        return $this->target;
-            $link = $this->target;
-        } else {
-            $link = \Container::$request->getBase() . $this->target;
-        }
-
-        return $link;
     }
 
     public function getHttpCode(): int

src/Routing/Route.php

@@ -1,6 +1,8 @@
 <?php namespace SokoWeb\Routing;
 
-class Route
+use SokoWeb\Interfaces\Routing\IRoute;
+
+class Route implements IRoute
 {
     private string $id;
 

src/Routing/RouteCollection.php

@@ -1,8 +1,10 @@
 <?php namespace SokoWeb\Routing;
 
 use Closure;
+use SokoWeb\Interfaces\Routing\IRoute;
+use SokoWeb\Interfaces\Routing\IRouteCollection;
 
-class RouteCollection
+class RouteCollection implements IRouteCollection
 {
     private array $routes = [];
 
@@ -32,7 +34,7 @@ class RouteCollection
         array_pop($this->groupStack);
     }
 
-    public function getRoute(string $id): ?Route
+    public function getRoute(string $id): ?IRoute
     {
         if (!isset($this->routes[$id])) {
             return null;

src/Session/DatabaseSessionHandler.php

@@ -3,15 +3,29 @@
 use DateTime;
 use SokoWeb\Database\Query\Modify;
 use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IConnection;
 use SokoWeb\Interfaces\Database\IResultSet;
 use SokoWeb\Interfaces\Session\ISessionHandler;
 
 class DatabaseSessionHandler implements ISessionHandler
 {
+    private IConnection $dbConnection;
+
+    private string $table;
+
+    private DateTime $shouldBeNewerThan;
+
     private bool $exists = false;
 
     private bool $written = false;
 
+    public function __construct(IConnection $dbConnection, string $table, DateTime $shouldBeNewerThan)
+    {
+        $this->dbConnection = $dbConnection;
+        $this->table = $table;
+        $this->shouldBeNewerThan = $shouldBeNewerThan;
+    }
+
     public function open($savePath, $sessionName): bool
     {
         return true;
@@ -24,24 +38,27 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function read($id): string
     {
-        $select = new Select(\Container::$dbConnection, 'sessions');
+        $select = new Select($this->dbConnection, $this->table);
-        $select->columns(['data']);
+        $select->columns(['data', 'updated']);
         $select->whereId(substr($id, 0, 32));
 
         $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
         if ($result === null) {
             return '';
         }
 
         $this->exists = true;
 
+        if (new DateTime($result['updated']) < $this->shouldBeNewerThan) {
+            return '';
+        }
+
         return $result['data'];
     }
 
     public function write($id, $data): bool
     {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
 
         if ($this->exists) {
             $modify->setId(substr($id, 0, 32));
@@ -60,7 +77,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function destroy($id): bool
     {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
         $modify->setId(substr($id, 0, 32));
         $modify->delete();
 
@@ -93,7 +110,7 @@ class DatabaseSessionHandler implements ISessionHandler
             return true;
         }
 
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
 
         $modify->setId(substr($id, 0, 32));
         $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));

templates/app.php.tpl

@@ -16,10 +16,12 @@ class Container
 {
     static SokoWeb\Interfaces\Database\IConnection $dbConnection;
     static SokoWeb\Interfaces\Database\IAuditLogger $auditLogger;
-    static SokoWeb\Routing\RouteCollection $routeCollection;
+    static SokoWeb\Interfaces\PersistentData\IPersistentDataManager $persistentDataManager;
+    static SokoWeb\Interfaces\Routing\IRouteCollection $routeCollection;
     static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
     static SokoWeb\Interfaces\Request\IRequest $request;
 }
 
 Container::$dbConnection = new SokoWeb\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
 Container::$auditLogger = new {app}\Database\AuditLogger(Container::$dbConnection, 'audit_log');
+Container::$persistentDataManager = new SokoWeb\PersistentData\PersistentDataManager(Container::$dbConnection, Container::$auditLogger);

templates/web.php.tpl

@@ -14,7 +14,7 @@ Container::$routeCollection = new SokoWeb\Routing\RouteCollection();
 Container::$routeCollection->get('index', '', [{app}\Controller\HomeController::class, 'getIndex']);
 
 if (isset($_COOKIE['COOKIES_CONSENT'])) {
-    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler();
+    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler(Container::$dbConnection, 'sessions');
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([