Merge pull request #19 from leafsphp/fix-session-lifetime-incorrect-w…

…hen-string-provided FIX: Session TTL incorrect when date string is provided in config
leafsphp · Oct 6, 2023 · 8844171 · 8844171
2 parents 4c299aa + 6178ac6
commit 8844171
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,8 @@
         }
     },
     "require-dev": {
-        "leafs/alchemy": "^1.0"
+        "leafs/alchemy": "^1.0",
+        "pestphp/pest": "^1.0 | ^2.0"
     },
     "scripts": {
         "test": "vendor/bin/pest --colors=always --coverage"

diff --git a/src/Auth.php b/src/Auth.php
@@ -585,12 +585,23 @@ private static function setUserToSession(array $user, string $token): void
      */
     private static function setSessionTtl(): void
     {
-        $sessionLifetime = is_int(static::config('SESSION_LIFETIME'))
-            ? static::config('SESSION_LIFETIME')
-            : (int) strtotime(static::config('SESSION_LIFETIME'));
+        $sessionLifetime = static::config('SESSION_LIFETIME');
 
-        if ($sessionLifetime > 0) {
+        if ($sessionLifetime === 0) {
+            return;
+        }
+
+        if (is_int($sessionLifetime)) {
             static::$session->set('SESSION_TTL', time() + $sessionLifetime);
+            return;
+        }
+
+        $sessionLifetimeInTime = strtotime($sessionLifetime);
+
+        if (!$sessionLifetimeInTime) {
+            throw new \Exception('Provided string could not be converted to time');
         }
+
+        static::$session->set('SESSION_TTL', $sessionLifetimeInTime);
     }
 }
diff --git a/tests/AuthSessionTest.php b/tests/AuthSessionTest.php
@@ -141,3 +141,25 @@
     sleep(2);
     expect($auth::status())->toBeFalse();
 });
+
+test('Session lifetime should set correct session ttl when string is configured instead of timestamp', function () {
+    $auth = new \Leaf\Auth();
+    $auth::config(getAuthConfig(['SESSION_LIFETIME' => '1 day']));
+    $auth::login(['username' => 'login-user', 'password' => 'login-pass']);
+
+    expect($auth::status())->not()->toBeNull();
+
+    $timestampOneDay = 60 * 60 * 24;
+    $session = new \Leaf\Http\Session(false);
+    $sessionTtl = $session->get('SESSION_TTL');
+
+    expect($sessionTtl)->toBe(time() + $timestampOneDay);
+});
+
+test('Login should throw error when lifetime string is invalid', function () {
+    $auth = new \Leaf\Auth();
+    $auth::config(getAuthConfig(['SESSION_LIFETIME' => 'invalid string']));
+
+    expect(fn() => $auth::login(['username' => 'login-user', 'password' => 'login-pass']))
+        ->toThrow(Exception::class, 'Provided string could not be converted to time');
+});