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

Merge 1.6.0 changes back to patch.

Browse Source
This commit is contained in:
Michael Jumper
2024-09-01 18:48:43 -07:00
parent df1745faa7 073d1d476e
commit 3de0a1e9df
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
View File

@@ -80,57 +80,57 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
/** /**
* Logger for this class. * Logger for this class.
*/ */
private final Logger logger = LoggerFactory.getLogger(AbstractGuacamoleTunnelService.class); private static final Logger logger = LoggerFactory.getLogger(AbstractGuacamoleTunnelService.class);
/** /**
* The prefix that will be used to generate JDBC tokens. * The prefix that will be used to generate JDBC tokens.
*/ */
private final String JDBC_TOKEN_PREFIX = "JDBC_"; private static final String JDBC_TOKEN_PREFIX = "JDBC_";
/** /**
* The token that contains the date the connection was started. * The token that contains the date the connection was started.
*/ */
private final String JDBC_DATE_TOKEN = JDBC_TOKEN_PREFIX + "STARTDATE"; private static final String JDBC_DATE_TOKEN = JDBC_TOKEN_PREFIX + "STARTDATE";
/** /**
* The format of the date in the date token. * The format of the date in the date token.
*/ */
private final String JDBC_DATE_TOKEN_FORMAT = "yyyyMMdd"; private static final String JDBC_DATE_TOKEN_FORMAT = "yyyyMMdd";
/** /**
* The token that contains the start time of the connection. * The token that contains the start time of the connection.
*/ */
private final String JDBC_TIME_TOKEN = JDBC_TOKEN_PREFIX + "STARTTIME"; private static final String JDBC_TIME_TOKEN = JDBC_TOKEN_PREFIX + "STARTTIME";
/** /**
* The format of the time in the time token. * The format of the time in the time token.
*/ */
private final String JDBC_TIME_TOKEN_FORMAT = "HHmmss"; private static final String JDBC_TIME_TOKEN_FORMAT = "HHmmss";
/** /**
* The token that contains the connection name. * The token that contains the connection name.
*/ */
private final String JDBC_CONNECTION_NAME_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_NAME"; private static final String JDBC_CONNECTION_NAME_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_NAME";
/** /**
* The token that contains the connection identifier. * The token that contains the connection identifier.
*/ */
private final String JDBC_CONNECTION_ID_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_ID"; private static final String JDBC_CONNECTION_ID_TOKEN = JDBC_TOKEN_PREFIX + "CONNECTION_ID";
/** /**
* The token that contains the hostname configured in the connection parameters. * The token that contains the hostname configured in the connection parameters.
*/ */
private final String JDBC_CONNECTION_HOSTNAME_TOKEN = JDBC_TOKEN_PREFIX + "HOSTNAME"; private static final String JDBC_CONNECTION_HOSTNAME_TOKEN = JDBC_TOKEN_PREFIX + "HOSTNAME";
/** /**
* The name of the parameter containing the hostname in the configuration. * The name of the parameter containing the hostname in the configuration.
*/ */
private final String JDBC_CONNECTION_HOSTNAME_TOKEN_PARAMETER = "hostname"; private static final String JDBC_CONNECTION_HOSTNAME_TOKEN_PARAMETER = "hostname";
/** /**
* The token containing the protocol configured in the connection. * The token containing the protocol configured in the connection.
*/ */
private final String JDBC_CONNECTION_PROTOCOL_TOKEN = JDBC_TOKEN_PREFIX + "PROTOCOL"; private static final String JDBC_CONNECTION_PROTOCOL_TOKEN = JDBC_TOKEN_PREFIX + "PROTOCOL";
/** /**
* Mapper for accessing connections. * Mapper for accessing connections.

1
extensions/guacamole-auth-ldap/schema/guacConfigGroup.ldif
View File

@@ -26,6 +26,7 @@ olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.1 NAME 'guacConfigProtocol'
olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.2 NAME 'guacConfigParameter' olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.2 NAME 'guacConfigParameter'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname' olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname'
SINGLE-VALUE
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort' olcAttributeTypes: ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort'
SINGLE-VALUE SINGLE-VALUE

1
extensions/guacamole-auth-ldap/schema/guacConfigGroup.schema
View File

@@ -24,6 +24,7 @@ attributetype ( 1.3.6.1.4.1.38971.1.1.2 NAME 'guacConfigParameter'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname' attributetype ( 1.3.6.1.4.1.38971.1.1.3 NAME 'guacConfigProxyHostname'
SINGLE-VALUE
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort' attributetype ( 1.3.6.1.4.1.38971.1.1.4 NAME 'guacConfigProxyPort'

2
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java
View File

@@ -87,7 +87,7 @@ public class ConnectionService {
public static final String LDAP_ATTRIBUTE_PROXY_PORT = "guacConfigProxyPort"; public static final String LDAP_ATTRIBUTE_PROXY_PORT = "guacConfigProxyPort";
/** /**
* The name of the LDAP attribute that stores guacd proxy hostname. * The name of the LDAP attribute that stores guacd proxy encryption method.
*/ */
public static final String LDAP_ATTRIBUTE_PROXY_ENCRYPTION = "guacConfigProxyEncryption"; public static final String LDAP_ATTRIBUTE_PROXY_ENCRYPTION = "guacConfigProxyEncryption";