GUACAMOLE-1239: Fix issue with records added by non-JDBC connections.

apache · Oct 18, 2024 · 2c5414a · 2c5414a
1 parent 61f6c8c
commit 2c5414a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...uth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java b/...uth-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 GuacamoleTunnel connect(GuacamoleClientInformation info,
 
         // 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/...se/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java b/...se/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
@@ -42,7 +42,7 @@
 public abstract class AbstractPermissionService<PermissionSetType extends PermissionSet<PermissionType>,
         PermissionType extends Permission>
     implements PermissionService<PermissionSetType, PermissionType> {
-    
+
     /**
      * Returns the ObjectPermissionSet related to the type of the given entity.
      * If the given entity represents a user, then the ObjectPermissionSet