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

GUACAMOLE-77: Merge username fix for current vs existing users.

Browse Source
This commit is contained in:
James Muehlner
2016-08-20 15:07:07 -07:00
parent 54f38b107c 20459ecbd3
commit 39a25db594
5 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/sharing/user/SharedUserContext.java
View File

@@ -39,7 +39,6 @@ import org.apache.guacamole.net.auth.UserContext;
import org.apache.guacamole.net.auth.simple.SimpleConnectionGroupDirectory;
import org.apache.guacamole.net.auth.simple.SimpleConnectionRecordSet;
import org.apache.guacamole.net.auth.simple.SimpleDirectory;
import org.apache.guacamole.net.auth.simple.SimpleUserDirectory;
/**
* The user context of a SharedUser, providing access ONLY to the user
@@ -114,9 +113,11 @@ public class SharedUserContext implements UserContext {
this.connectionGroupDirectory = new SimpleConnectionGroupDirectory(
Collections.singletonList(this.rootGroup));
// The user directory contains only this user
// Create internal pseudo-account representing the authenticated user
this.self = new SharedUser(user, this);
this.userDirectory = new SimpleUserDirectory(this.self);
// Do not provide access to any user accounts via the directory
this.userDirectory = new SimpleDirectory<User>();
}

8
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
View File

@@ -38,10 +38,18 @@
"NAME" : "MySQL"
},
"DATA_SOURCE_MYSQL_SHARED" : {
"NAME" : "Shared Connections (MySQL)"
},
"DATA_SOURCE_POSTGRESQL" : {
"NAME" : "PostgreSQL"
},
"DATA_SOURCE_POSTGRESQL_SHARED" : {
"NAME" : "Shared Connections (PostgreSQL)"
},
"HOME" : {
"INFO_SHARED_BY" : "Shared by {USERNAME}"
},