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

Ticket #269: Make all fields private, change default methods to public.

Browse Source
This commit is contained in:
Michael Jumper
2013-02-26 02:35:25 -08:00
parent fdf49603c5
commit 97c1bc6a28
8 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
View File

@@ -71,26 +71,26 @@ public class ConnectionDirectory implements Directory<String, Connection>{
private int user_id;
@Inject
PermissionCheckService permissionCheckUtility;
private PermissionCheckService permissionCheckUtility;
@Inject
ProviderService providerUtility;
private ProviderService providerUtility;
@Inject
ConnectionMapper connectionDAO;
private ConnectionMapper connectionDAO;
@Inject
ConnectionPermissionMapper connectionPermissionDAO;
private ConnectionPermissionMapper connectionPermissionDAO;
@Inject
ConnectionParameterMapper connectionParameterDAO;
private ConnectionParameterMapper connectionParameterDAO;
/**
* Set the user for this directory.
*
* @param user_id The ID of the user owning this connection directory.
*/
void init(int user_id) {
public void init(int user_id) {
this.user_id = user_id;
}

12
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
View File

@@ -62,19 +62,19 @@ import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
public class MySQLConnection implements Connection {
@Inject
ConnectionMapper connectionDAO;
private ConnectionMapper connectionDAO;
@Inject
ConnectionParameterMapper connectionParameterDAO;
private ConnectionParameterMapper connectionParameterDAO;
@Inject
ProviderService providerUtility;
private ProviderService providerUtility;
@Inject
ActiveConnectionSet activeConnectionSet;
private ActiveConnectionSet activeConnectionSet;
@Inject
ConfigurationTranslationService configurationTranslationUtility;
private ConfigurationTranslationService configurationTranslationUtility;
private net.sourceforge.guacamole.net.auth.mysql.model.Connection connection;
@@ -83,7 +83,7 @@ public class MySQLConnection implements Connection {
/**
* Create a default, empty connection.
*/
MySQLConnection() {
public MySQLConnection() {
connection = new net.sourceforge.guacamole.net.auth.mysql.model.Connection();
configuration = new GuacamoleConfiguration();
}

6
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java
View File

@@ -63,19 +63,19 @@ public class MySQLConnectionRecord implements ConnectionRecord {
* DAO for accessing users.
*/
@Inject
UserMapper userDAO;
private UserMapper userDAO;
/**
* DAO for accessing connections.
*/
@Inject
ConnectionMapper connectionDAO;
private ConnectionMapper connectionDAO;
/**
* Service for creating and retrieving objects.
*/
@Inject
ProviderService providerUtility;
private ProviderService providerUtility;
/**
* Initialize this MySQLConnectionRecord with the database record it

2
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleSocket.java
View File

@@ -53,7 +53,7 @@ public class MySQLGuacamoleSocket implements GuacamoleSocket {
* Injected ActiveConnectionSet which will contain all active connections.
*/
@Inject
ActiveConnectionSet activeConnectionSet;
private ActiveConnectionSet activeConnectionSet;
/**
* The wrapped socket.

15
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java
View File

@@ -59,14 +59,23 @@ public class MySQLUser extends AbstractUser {
*/
private Integer userID;
/**
* Service for encrypting passwords.
*/
@Inject
PasswordEncryptionService passwordUtility;
private PasswordEncryptionService passwordUtility;
/**
* Service for generating random salts.
*/
@Inject
SaltService saltUtility;
private SaltService saltUtility;
/**
* Service for checking permissions.
*/
@Inject
PermissionCheckService permissionCheckUtility;
private PermissionCheckService permissionCheckUtility;
/**
* The set of current permissions a user has.

2
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java
View File

@@ -82,7 +82,7 @@ public class MySQLUserContext implements UserContext {
*
* @param user_id The ID of the user owning this context.
*/
void init(int user_id) {
public void init(int user_id) {
this.user_id = user_id;
userDirectory.init(user_id);
connectionDirectory.init(user_id);

26
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java
View File

@@ -93,50 +93,56 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
* DAO for accessing users, which will be injected.
*/
@Inject
UserMapper userDAO;
private UserMapper userDAO;
/**
* DAO for accessing connections, which will be injected.
*/
@Inject
ConnectionMapper connectionDAO;
private ConnectionMapper connectionDAO;
/**
* DAO for accessing user permissions, which will be injected.
*/
@Inject
UserPermissionMapper userPermissionDAO;
private UserPermissionMapper userPermissionDAO;
/**
* DAO for accessing connection permissions, which will be injected.
*/
@Inject
ConnectionPermissionMapper connectionPermissionDAO;
private ConnectionPermissionMapper connectionPermissionDAO;
/**
* DAO for accessing system permissions, which will be injected.
*/
@Inject
SystemPermissionMapper systemPermissionDAO;
private SystemPermissionMapper systemPermissionDAO;
/**
* Utility class for checking various permissions, which will be injected.
*/
@Inject
PermissionCheckService permissionCheckUtility;
private PermissionCheckService permissionCheckUtility;
/**
* Utility class that provides convenient access to object creation and
* retrieval functions.
*/
@Inject
ProviderService providerUtility;
private ProviderService providerUtility;
/**
* Service for encrypting passwords.
*/
@Inject
PasswordEncryptionService passwordUtility;
private PasswordEncryptionService passwordUtility;
/**
* Service for generating random salts.
*/
@Inject
SaltService saltUtility;
private SaltService saltUtility;
/**
* Set the user for this directory.
@@ -144,7 +150,7 @@ public class UserDirectory implements Directory<String, net.sourceforge.guacamol
* @param user_id The ID of the user whose permissions define the visibility
* of other users in this directory.
*/
void init(int user_id) {
public void init(int user_id) {
this.user_id = user_id;
}

14
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionCheckService.java
View File

@@ -78,25 +78,25 @@ import net.sourceforge.guacamole.net.auth.permission.UserPermission;
public class PermissionCheckService {
@Inject
UserMapper userDAO;
private UserMapper userDAO;
@Inject
ConnectionMapper connectionDAO;
private ConnectionMapper connectionDAO;
@Inject
UserPermissionMapper userPermissionDAO;
private UserPermissionMapper userPermissionDAO;
@Inject
ConnectionPermissionMapper connectionPermissionDAO;
private ConnectionPermissionMapper connectionPermissionDAO;
@Inject
SystemPermissionMapper systemPermissionDAO;
private SystemPermissionMapper systemPermissionDAO;
@Inject
Provider<MySQLUser> mySQLUserProvider;
private Provider<MySQLUser> mySQLUserProvider;
@Inject
Provider<MySQLConnection> mySQLConnectionProvider;
private Provider<MySQLConnection> mySQLConnectionProvider;
/**
* Verifies that the user has read access to the given user. If not, throws a GuacamoleSecurityException.