safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1299: Merge handle errors that occur while automatically invalidating expired sessions.

Browse Source
This commit is contained in:
Virtually Nick
2021-02-25 10:35:30 -05:00
committed by GitHub
parent 5da596137c b1dcec7ca9
commit 3006988657
1 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
View File

@@ -113,9 +113,14 @@ public class HashTokenSessionMap implements TokenSessionMap {
public SessionEvictionTask(long sessionTimeout) {
this.sessionTimeout = sessionTimeout;
}
@Override
public void run() {
/**
* Iterates through all active sessions, evicting those sessions which
* are beyond the session timeout. Internal errors which would
* otherwise stop the session eviction process are caught, logged, and
* the process is allowed to proceed.
*/
private void evictExpiredSessions() {
// Get start time of session check time
long sessionCheckStart = System.currentTimeMillis();
@@ -129,18 +134,29 @@ public class HashTokenSessionMap implements TokenSessionMap {
Map.Entry<String, GuacamoleSession> entry = entries.next();
GuacamoleSession session = entry.getValue();
// Do not expire sessions which are active
if (session.hasTunnels())
continue;
try {
// Get elapsed time since last access
long age = sessionCheckStart - session.getLastAccessedTime();
// Do not expire sessions which are active
if (session.hasTunnels())
continue;
// If session is too old, evict it and check the next one
if (age >= sessionTimeout) {
logger.debug("Session \"{}\" has timed out.", entry.getKey());
entries.remove();
session.invalidate();
// Get elapsed time since last access
long age = sessionCheckStart - session.getLastAccessedTime();
// If session is too old, evict it and check the next one
if (age >= sessionTimeout) {
logger.debug("Session \"{}\" has timed out.", entry.getKey());
entries.remove();
session.invalidate();
}
}
catch (Throwable t) {
logger.error("An unexpected internal error prevented a "
+ "session from being invalidated. This should "
+ "NOT happen and is likely a bug. Depending on "
+ "the nature of the failure, the session may "
+ "still be valid.", t);
}
}
@@ -151,6 +167,27 @@ public class HashTokenSessionMap implements TokenSessionMap {
}
@Override
public void run() {
// The evictExpiredSessions() function should already
// automatically handle and log all unexpected internal errors,
// but wrap the entire call in a try/catch plus additional logging
// to ensure that absolutely no errors can result in the entire
// thread dying
try {
evictExpiredSessions();
}
catch (Throwable t) {
logger.error("An unexpected internal error prevented the "
+ "session eviction task from completing "
+ "successfully. This should NOT happen and is likely "
+ "a bug. Sessions that should have expired may "
+ "remain valid.", t);
}
}
}
@Override