Skip to content

FOUR-13942 the kill existing session in device restriction is not working correctly #6153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 1 commit into from
Feb 6, 2024
Merged

FOUR-13942 the kill existing session in device restriction is not working correctly #6153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ProcessMaker/Http/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Expand Down
42 changes: 22 additions & 20 deletions ProcessMaker/Http/Middleware/SessionControlKill.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,27 @@ class SessionControlKill
*/
public function handle(Request $request, Closure $next): Response
{
$user = Auth::user();
$userSession = $request->session()->get('user_session');

if ($userSession) {
$configIP = Setting::configByKey(self::IP_RESTRICTION_KEY);
$configDevice = Setting::configByKey(self::DEVICE_RESTRICTION_KEY);

$session = $this->getActiveSession($user, $userSession);

if ($session) {
// Checks if the session has expired based on the IP address
$isSessionExpiredByIP = $configIP === '2' && $this->isSessionExpiredByIP($session, $request);
// Checks if the session has expired based on the device
$isSessionExpiredByDevice = $configDevice === '2' && $this->isSessionExpiredByDevice($session);
// Checks if the session has expired except the one within the active device
$isAnyRestrictionEnabled = $configIP === '1' || $configDevice === '1';

if ($isSessionExpiredByIP || $isSessionExpiredByDevice || $isAnyRestrictionEnabled) {
return $this->killSessionAndRedirect($session);
if (Auth::check()) {
$user = Auth::user();
$userSession = $request->session()->get('user_session');

if ($userSession) {
$configIP = Setting::configByKey(self::IP_RESTRICTION_KEY);
$configDevice = Setting::configByKey(self::DEVICE_RESTRICTION_KEY);

$session = $this->getActiveSession($user, $userSession);

if ($session) {
// Checks if the session has expired based on the IP address
$isSessionExpiredByIP = $configIP === '2' && $this->isSessionExpiredByIP($session, $request);
// Checks if the session has expired based on the device
$isSessionExpiredByDevice = $configDevice === '2' && $this->isSessionExpiredByDevice($session);
// Checks if the session has expired except the one within the active device
$isAnyRestrictionEnabled = $configIP === '1' || $configDevice === '1';

if ($isSessionExpiredByIP || $isSessionExpiredByDevice || $isAnyRestrictionEnabled) {
return $this->killSessionAndRedirect($session);
}
}
}
}
Expand All @@ -57,8 +59,8 @@ private function getActiveSession(User $user, string $userSession): ?UserSession
->where([
['is_active', true],
['token', $userSession],
['expired_date', '!=', null],
])
->whereNotNull('expired_date')
->first();
}

Expand Down