Allow overriding of guacd-[hostname/port/ssl] within the connection's json properties #795
Conversation
|
@marvin-enthus if you shoot an email to private@guacamole.apache.org, I can create a JIRA account for you. |
| @@ -176,6 +177,22 @@ public GuacamoleTunnel connect(UserData.Connection connection, | |||
| String hostname = proxyConfig.getHostname(); | |||
| int port = proxyConfig.getPort(); | |||
|
|
|||
| // handle guacd-[hostname/port/ssl] overrides | |||
| Map<String, String> params = connection.getParameters(); | |||
There was a problem hiding this comment.
The guacd hostname, port, etc. are not connection parameters, which are strictly the protocol-specific key/value pairs for configuring the connection as defined by the protocol plugin that guacd ultimately loads. Additional properties configuring the details for guacd will need to be at a different level of the JSON, perhaps directly within the connection, not within the connection params.
There was a problem hiding this comment.
Hi Mike. I Just pushed an other commit migrating this to connection level.
Currently i'm not sure about the best approach - I've allinged the java class with the current camelCase, so the settings are currently also in camelCase:
{
"username" : "arbitraryUsername",
"expires" : TIMESTAMP,
"connections" : {
"Connection Name" : {
"protocol" : "PROTOCOL",
"guacdHostname" : "my-other-guacd-host",
"guacdPort" : 4822,
"guacdSsl" : false,
"parameters" : {
"name1" : "value1",
"name2" : "value2",
...
}
},
...
}
}
But that's not matching the names in other places. I could set some annotations for the jackson data mapper, but haven't found any json annotation on the code - so i'm not sure about this...
| if (overrideGuacdHostname != null && !overrideGuacdHostname.isEmpty()) { | ||
| hostname = overrideGuacdHostname; | ||
| } | ||
| Integer overrideGuacdPort = connection.getGuacdPort(); |
There was a problem hiding this comment.
I think we prefer int over Integer unless you need the extra functionality of Integer.
| port = overrideGuacdPort; | ||
| } | ||
| EncryptionMethod proxyMethod = proxyConfig.getEncryptionMethod(); | ||
| Boolean overrideGuacdSSL = connection.getGuacdSsl(); |
There was a problem hiding this comment.
Similarly, I think we prefer boolean over Boolean, unless specifically requiring Boolean.
Hi,
this is just a simple extension to the guacamole-auth-json module allowing to specify
guacd-hostname,guacd-portandguacd-ssloverrides within the connection properties config. Like it is also possible for connections configured via a database.A config snipplet looks like be:
{ "username" : "arbitraryUsername", "expires" : TIMESTAMP, "connections" : { "Connection Name" : { "protocol" : "PROTOCOL", "parameters" : { "guacd-hostname" : "my-other-guacd-host", "guacd-port" : "4822", ... } }, ... } }I'm opening this PR without a JIRA ticket as I don't have an ASF account and it's not stright-forward to register. Maybe someone creates the Issue on behalf of me ;)