From 5e9c2c668960073926caf63d1518dbad0a6eda3f Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Wed, 31 May 2017 08:27:07 -0400 Subject: [PATCH 1/4] GUACAMOLE-203: Add support for configuring the server-alive-interval SSH parameter. --- .../main/resources/org/apache/guacamole/protocols/ssh.json | 6 +++++- guacamole/src/main/webapp/translations/en.json | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json index 93cef92b6..b3e81b7f4 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json @@ -69,6 +69,10 @@ { "name" : "command", "type" : "TEXT" + }, + { + "name" : "server-alive-interval", + "type" : "NUMERIC" } ] }, @@ -137,4 +141,4 @@ } ] -} \ No newline at end of file +} diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 4995f54c8..2ce69322d 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -425,6 +425,7 @@ "FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", + "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server Keepalive Interval:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", From 605ff4f6156e96f0bf40ebce45581dce50c3b7c4 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Wed, 31 May 2017 21:07:14 -0400 Subject: [PATCH 2/4] GUACAMOLE-203: Add configuration option for SSH keepalives in SFTP connections. --- .../main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ .../main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 2 ++ 3 files changed, 10 insertions(+) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json index d7681a9e8..32a6b0021 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json @@ -318,6 +318,10 @@ { "name" : "sftp-directory", "type" : "TEXT" + }, + { + "name" : "sftp-keepalive", + "type" : "NUMERIC" } ] } diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json index 4d42f55bc..a06fb8fe4 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json @@ -131,6 +131,10 @@ { "name" : "sftp-directory", "type" : "TEXT" + }, + { + "name" : "sftp-keepalive", + "type" : "NUMERIC" } ] }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 2ce69322d..fb17e4e66 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -355,6 +355,7 @@ "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", @@ -532,6 +533,7 @@ "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", From 431a918af7b5ca897e8e5f58bc254a9d6a7bd5db Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Wed, 14 Jun 2017 08:39:12 -0400 Subject: [PATCH 3/4] GUACAMOLE-203: Change parameter name for consistency --- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 2 +- .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json index 32a6b0021..ada63d553 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json @@ -320,7 +320,7 @@ "type" : "TEXT" }, { - "name" : "sftp-keepalive", + "name" : "sftp-server-alive-interval", "type" : "NUMERIC" } ] diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json index a06fb8fe4..270d60300 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json @@ -133,7 +133,7 @@ "type" : "TEXT" }, { - "name" : "sftp-keepalive", + "name" : "sftp-server-alive-interval", "type" : "NUMERIC" } ] From 4ee49e97a2d1fdd36273d583547c617862e5bc19 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sun, 25 Jun 2017 16:49:00 -0400 Subject: [PATCH 4/4] GUACAMOLE-203: Fix case issues, correct field header name. --- .../src/main/webapp/translations/en.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index fb17e4e66..7b5f7e632 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -353,14 +353,14 @@ "FIELD_HEADER_REMOTE_APP" : "Program:", "FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", - "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", - "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", - "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", - "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", - "FIELD_HEADER_SFTP_PASSWORD" : "Password:", - "FIELD_HEADER_SFTP_PORT" : "Port:", - "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", - "FIELD_HEADER_SFTP_USERNAME" : "Username:", + "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", + "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", + "FIELD_HEADER_SFTP_PASSWORD" : "Password:", + "FIELD_HEADER_SFTP_PORT" : "Port:", + "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_WIDTH" : "Width:", @@ -426,7 +426,7 @@ "FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", - "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server Keepalive Interval:", + "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", @@ -531,14 +531,14 @@ "FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", - "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", - "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", - "FIELD_HEADER_SFTP_KEEPALIVE" : "SFTP Keepalive Interval:", - "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", - "FIELD_HEADER_SFTP_PASSWORD" : "Password:", - "FIELD_HEADER_SFTP_PORT" : "Port:", - "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", - "FIELD_HEADER_SFTP_USERNAME" : "Username:", + "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", + "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", + "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", + "FIELD_HEADER_SFTP_PASSWORD" : "Password:", + "FIELD_HEADER_SFTP_PORT" : "Port:", + "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:", "FIELD_OPTION_COLOR_DEPTH_8" : "256 color",