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

Merge patch branch changes to main.

Browse Source
This commit is contained in:
Virtually Nick
2024-05-09 17:13:48 -04:00
parent c721ee21a2 1b2da5fbda
commit 3b8be53d25
2 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ConnectionService.java
View File

@@ -29,6 +29,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.guacamole.auth.jdbc.user.ModeledAuthenticatedUser; import org.apache.guacamole.auth.jdbc.user.ModeledAuthenticatedUser;
import org.apache.guacamole.language.TranslatableGuacamoleClientOverrunException;
import org.apache.guacamole.language.TranslatableMessage;
import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper; import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper;
import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService; import org.apache.guacamole.auth.jdbc.tunnel.GuacamoleTunnelService;
import org.apache.guacamole.GuacamoleClientException; import org.apache.guacamole.GuacamoleClientException;
@@ -90,6 +92,11 @@ public class ConnectionService extends ModeledChildDirectoryObjectService<Modele
@Inject @Inject
private GuacamoleTunnelService tunnelService; private GuacamoleTunnelService tunnelService;
/**
* Known limit for the size of the connection parameter values.
*/
private static final int CONNECTION_PARAMETER_VALUE_LIMIT = 4096;
@Override @Override
protected ModeledDirectoryObjectMapper<ConnectionModel> getObjectMapper() { protected ModeledDirectoryObjectMapper<ConnectionModel> getObjectMapper() {
return connectionMapper; return connectionMapper;
@@ -154,11 +161,50 @@ public class ConnectionService extends ModeledChildDirectoryObjectService<Modele
} }
/**
* Validates that all connection parameter values are within the expected size limit.
*
* @param parameters
* The map of connection parameter name/value pairs to validate.
*
* @throws GuacamoleClientException
* If any of the parameter values exceed the defined limit.
*/
private void validateParameters(Map<String, String> parameters) throws GuacamoleClientException {
// Iterate through each parameter to validate its size
for (Map.Entry<String, String> parameter : parameters.entrySet()) {
String value = parameter.getValue();
// Check if parameter value exceeds size limit
if (value != null && value.length() > CONNECTION_PARAMETER_VALUE_LIMIT) {
Map<String, Object> vars = new HashMap<>();
vars.put("MAX_SIZE", CONNECTION_PARAMETER_VALUE_LIMIT);
vars.put("PARAMETER_NAME", parameter.getKey());
// Create a translatable message with the error key and substitution variables
TranslatableMessage translatableMessage = new TranslatableMessage(
"CONNECTION_PARAMETERS.DATABASE_PARAMETER_VALUE_TOO_LONG",
vars
);
throw new TranslatableGuacamoleClientOverrunException(
"The value provided for connection parameter \"" + parameter.getKey() +
"\" exceeds the maximum allowed length.",
translatableMessage
);
}
}
}
@Override @Override
protected void beforeCreate(ModeledAuthenticatedUser user, protected void beforeCreate(ModeledAuthenticatedUser user,
Connection object, ConnectionModel model) Connection object, ConnectionModel model)
throws GuacamoleException { throws GuacamoleException {
// Validate parameters before saving
validateParameters(object.getConfiguration().getParameters());
super.beforeCreate(user, object, model); super.beforeCreate(user, object, model);
// Name must not be blank // Name must not be blank
@@ -177,6 +223,9 @@ public class ConnectionService extends ModeledChildDirectoryObjectService<Modele
ModeledConnection object, ConnectionModel model) ModeledConnection object, ConnectionModel model)
throws GuacamoleException { throws GuacamoleException {
// Validate parameters before saving
validateParameters(object.getConfiguration().getParameters());
super.beforeUpdate(user, object, model); super.beforeUpdate(user, object, model);
// Name must not be blank // Name must not be blank

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

@@ -108,6 +108,10 @@
"SECTION_HEADER_RESTRICTIONS" : "Group Restrictions" "SECTION_HEADER_RESTRICTIONS" : "Group Restrictions"
},
"CONNECTION_PARAMETERS": {
"DATABASE_PARAMETER_VALUE_TOO_LONG": "The value provided for connection parameter {PARAMETER_NAME} exceeds the maximum allowed length of {MAX_SIZE} {MAX_SIZE, plural, one{character} other{characters}}."
} }
} }