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

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

Browse Source
This commit is contained in:
Virtually Nick
2024-10-14 11:16:06 -04:00
parent 61f6c8ceb1
commit 2c5414aee2
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/HistoryTrackingConnection.java
View File

@@ -56,12 +56,6 @@ public class HistoryTrackingConnection extends DelegatingConnection {
* established connections. * established connections.
*/ */
private final ConnectionRecordMapper connectionRecordMapper; private final ConnectionRecordMapper connectionRecordMapper;
/**
* The Guacamole server environment.
*/
@Inject
private JDBCEnvironment environment;
/** /**
* Creates a new HistoryConnection that wraps the given connection, * 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 // Insert the connection history record to mark the start of this connection
connectionRecordMapper.insert(connectionRecordModel, connectionRecordMapper.insert(connectionRecordModel,
environment.getCaseSensitiveUsernames()); currentUser.isCaseSensitive());
// Include history record UUID as token // Include history record UUID as token
ModeledConnectionRecord modeledRecord = new ModeledConnectionRecord(connectionRecordModel); ModeledConnectionRecord modeledRecord = new ModeledConnectionRecord(connectionRecordModel);

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/permission/AbstractPermissionService.java
View File

@@ -42,7 +42,7 @@ import org.apache.guacamole.net.auth.permission.PermissionSet;
public abstract class AbstractPermissionService<PermissionSetType extends PermissionSet<PermissionType>, public abstract class AbstractPermissionService<PermissionSetType extends PermissionSet<PermissionType>,
PermissionType extends Permission> PermissionType extends Permission>
implements PermissionService<PermissionSetType, PermissionType> { implements PermissionService<PermissionSetType, PermissionType> {
/** /**
* Returns the ObjectPermissionSet related to the type of the given entity. * Returns the ObjectPermissionSet related to the type of the given entity.
* If the given entity represents a user, then the ObjectPermissionSet * If the given entity represents a user, then the ObjectPermissionSet