GUAC-1101: Filter configurations through TokenFilter upon connecting.

This commit is contained in:
Michael Jumper
2015-02-25 16:50:52 -08:00
parent 89f0f4783e
commit 1ac9f92206

View File

@@ -47,6 +47,8 @@ import org.glyptodon.guacamole.net.auth.ConnectionRecord;
import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
import org.glyptodon.guacamole.token.StandardTokens;
import org.glyptodon.guacamole.token.TokenFilter;
/**
@@ -186,6 +188,13 @@ public abstract class AbstractGuacamoleSocketService implements GuacamoleSocketS
for (ParameterModel parameter : parameters)
config.setParameter(parameter.getName(), parameter.getValue());
// Build token filter containing credential tokens
TokenFilter tokenFilter = new TokenFilter();
StandardTokens.addStandardTokens(tokenFilter, user.getCredentials());
// Filter the configuration
tokenFilter.filterValues(config.getParameters());
// Return new socket
try {