GUACAMOLE-422: Add timezone to tunnel connections.

This commit is contained in:
Nick Couchman authored and Virtually Nick committed 2019-04-22 11:53:09 -04:00
1 parent 8ad65d6e6c
commit 047ed7ac9c
4 files changed
+56 -1

No files matched your search

@@ -476,6 +476,15 @@ public abstract class AbstractGuacamoleTunnelService implements GuacamoleTunnelS
activeConnections.put(connection.getIdentifier(), activeConnection);
activeConnectionGroups.put(connection.getParentIdentifier(), activeConnection);
config = getGuacamoleConfiguration(activeConnection.getUser(), connection);
// If timezone is provided by tunnel parameter, and not
// overriden by connection parameter, set it.
String tzTunnel = info.getTimezone();
String tzParam = config.getParameter("timezone");
if ((tzParam == null || tzParam.isEmpty())
&& tzTunnel != null && !tzTunnel.isEmpty())
config.setParameter("timezone", tzTunnel);
}
// If we ARE joining an active connection, generate a configuration