From 2c5414aee24383774f76cbb783e1ff9b9882d04c Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 14 Oct 2024 11:16:06 -0400 Subject: [PATCH] GUACAMOLE-1239: Fix issue with records added by non-JDBC connections. --- .../guacamole/auth/jdbc/HistoryTrackingConnection.java | 8 +------- .../auth/jdbc/permission/AbstractPermissionService.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java index cdd50e3bc..c8aea8536 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java @@ -56,12 +56,6 @@ public class HistoryTrackingConnection extends DelegatingConnection { * established connections. */ private final ConnectionRecordMapper connectionRecordMapper; - - /** - * The Guacamole server environment. - */ - @Inject - private JDBCEnvironment environment; /** * Creates a new HistoryConnection that wraps the given connection, @@ -106,7 +100,7 @@ public class HistoryTrackingConnection extends DelegatingConnection { // Insert the connection history record to mark the start of this connection connectionRecordMapper.insert(connectionRecordModel, - environment.getCaseSensitiveUsernames()); + currentUser.isCaseSensitive()); // Include history record UUID as token ModeledConnectionRecord modeledRecord = new ModeledConnectionRecord(connectionRecordModel); diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java index 90dec2f9d..eb320bdb3 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java @@ -42,7 +42,7 @@ import org.apache.guacamole.net.auth.permission.PermissionSet; public abstract class AbstractPermissionService, PermissionType extends Permission> implements PermissionService { - + /** * Returns the ObjectPermissionSet related to the type of the given entity. * If the given entity represents a user, then the ObjectPermissionSet