Skip to content

FOUR-13910 block duplicate session in device restriction only works when the initial browser has the session open #6121

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 3 commits into from
Feb 1, 2024
Merged

FOUR-13910 block duplicate session in device restriction only works when the initial browser has the session open #6121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52a48ef
feat: check all active sessions in block session by device
Jan 30, 2024
4efb34b
fix: session control middlewares
Jan 31, 2024
584be75
fix: refactor session expiration
Jan 31, 2024
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
23 changes: 15 additions & 8 deletions ProcessMaker/Http/Middleware/SessionControlBlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,21 +97,28 @@ private function blockSessionByDevice(User $user, Request $request): bool
$requestDevice = $this->formatDeviceInfo($agentDevice, $agent->deviceType(), $agent->platform());
// Get the user's current IP address
$ip = $request->getClientIp() ?? $request->ip();
// Get the user's most recent session
$session = $user->sessions()
->where('is_active', true)
// Get the active user sessions
$sessions = $user->sessions()
->where([
['is_active', true],
['expired_date', null],
])
->orderBy('created_at', 'desc')
->first();
->get();

if ($session) {
$openSessions = $sessions->reduce(function ($carry, $session) use ($requestDevice, $ip) {
$sessionDevice = $this->formatDeviceInfo(
$session->device_name, $session->device_type, $session->device_platform
);

return $requestDevice !== $sessionDevice || $session->ip_address !== $ip;
}
if ($requestDevice !== $sessionDevice || $session->ip_address !== $ip) {
return $carry + 1;
} else {
return $carry - 1;
}
}, 0);

return false;
return $openSessions > 0;
}

private function formatDeviceInfo(string $deviceName, string $deviceType, string $devicePlatform): string
Expand Down
18 changes: 11 additions & 7 deletions ProcessMaker/Http/Middleware/SessionControlKill.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@ public function handle(Request $request, Closure $next): Response

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

// Checks if the session has expired based on the IP address
if ($session && $configIP === '2' && $this->isSessionExpiredByIP($session, $request)) {
return $this->killSessionAndRedirect($session);
}
// Checks if the session has expired based on the device
if ($session && $configDevice === '2' && $this->isSessionExpiredByDevice($session)) {
return $this->killSessionAndRedirect($session);
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 Down
33 changes: 14 additions & 19 deletions ProcessMaker/Models/UserSession.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,15 @@ public static function expiresDuplicatedSessionByIP()
{
$usersActiveIP = [];
self::where('is_active', true)
->where('expired_date', null)
->orderBy('id', 'desc')
->whereNull('expired_date')
->orderBy('user_id', 'asc')
->orderBy('created_at', 'desc')
->chunk(100, function ($sessions) use (&$usersActiveIP) {
foreach ($sessions as $session) {
$key = $session->user_id . '.' . $session->ip_address;
if (!isset($usersActiveIP[$session->user_id])) {
$usersActiveIP[$session->user_id] = $key;
}
// expire all sessions except the ones within the active IP
if ($usersActiveIP[$session->user_id] !== $key) {
if (!array_key_exists($session->user_id, $usersActiveIP)) {
$usersActiveIP[$session->user_id] = $session->user_id;
} else {
// expire all sessions except the ones within the active IP
$session->update(['expired_date' => now()]);
}
}
Expand All @@ -61,19 +60,15 @@ public static function expiresDuplicatedSessionByDevice()
{
$usersActiveDevice = [];
self::where('is_active', true)
->where('expired_date', null)
->orderBy('id', 'desc')
->whereNull('expired_date')
->orderBy('user_id', 'asc')
->orderBy('created_at', 'desc')
->chunk(100, function ($sessions) use (&$usersActiveDevice) {
foreach ($sessions as $session) {
$key = $session->user_id . '.' .
$session->device_name . '.' .
$session->device_type . '.' .
$session->device_platform;
if (!isset($usersActiveDevice[$session->user_id])) {
$usersActiveDevice[$session->user_id] = $key;
}
// expire all sessions except the ones within the active device
if ($usersActiveDevice[$session->user_id] !== $key) {
if (!array_key_exists($session->user_id, $usersActiveDevice)) {
$usersActiveDevice[$session->user_id] = $session->user_id;
} else {
// expire all sessions except the ones within the active device
$session->update(['expired_date' => now()]);
}
}
Expand Down