From b92222c3a09eefa9d5089c0d7e816ecba8039652 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 26 Aug 2024 13:23:15 -0400 Subject: [PATCH 1/3] GUACAMOLE-600: Add RDP timeout client options. --- .../main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ guacamole/src/main/frontend/src/translations/en.json | 1 + 2 files changed, 5 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 e26bbb42e..eafb2578b 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 @@ -12,6 +12,10 @@ { "name" : "port", "type" : "NUMERIC" + }, + { + "name" : "timeout", + "type" : "NUMERIC" } ] }, diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index 5b0ff7994..4b19f773b 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -647,6 +647,7 @@ "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", + "FIELD_HEADER_TIMEOUT" : "Connection timeout", "FIELD_HEADER_TIMEZONE" : "Time zone:", "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_WIDTH" : "Width:", From 821af60a88ccebccefbcbdab8e013fe27f07b287 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 26 Aug 2024 13:34:35 -0400 Subject: [PATCH 2/3] GUACAMOLE-600: Add SSH and SFTP timeout client options. --- .../main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ .../main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++ .../main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/frontend/src/translations/en.json | 7 +++++-- 4 files changed, 17 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 eafb2578b..f80479630 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 @@ -424,6 +424,10 @@ "name" : "sftp-port", "type" : "NUMERIC" }, + { + "name" : "sftp-timeout", + "type" : "NUMERIC" + }, { "name" : "sftp-host-key", "type" : "TEXT" 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 3f27172c8..2413b4465 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 @@ -16,6 +16,10 @@ { "name" : "host-key", "type" : "TEXT" + }, + { + "name" : "timeout", + "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 62c34ac97..33d45e94b 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 @@ -175,6 +175,10 @@ "name" : "sftp-port", "type" : "NUMERIC" }, + { + "name" : "sftp-timeout", + "type" : "NUMERIC" + }, { "name" : "sftp-host-key", "type" : "TEXT" diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index 4b19f773b..a6553c6f4 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -636,6 +636,7 @@ "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", + "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", @@ -644,7 +645,7 @@ "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", - "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", + "FIELD_HEADER_SFTP_TIMEOUT" : "SFTP connection timeout:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", "FIELD_HEADER_TIMEOUT" : "Connection timeout", @@ -755,6 +756,7 @@ "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", + "FIELD_HEADER_TIMEOUT" : "Connection timeout:", "FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", @@ -929,6 +931,7 @@ "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", + "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", @@ -937,7 +940,7 @@ "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", - "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", + "FIELD_HEADER_SFTP_TIMEOUT" : "SFTP connection timeout:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:", "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", From 2a97e327fbc825323b78d726a38db524dedd6029 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 26 Aug 2024 13:36:56 -0400 Subject: [PATCH 3/3] GUACAMOLE-600: Add telnet connection timeout client setting. --- .../main/resources/org/apache/guacamole/protocols/telnet.json | 4 ++++ guacamole/src/main/frontend/src/translations/en.json | 1 + 2 files changed, 5 insertions(+) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json index 42640b5eb..041c3acc9 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json @@ -12,6 +12,10 @@ { "name" : "port", "type" : "NUMERIC" + }, + { + "name" : "timeout", + "type" : "NUMERIC" } ] }, diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index a6553c6f4..a0098f7a7 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -843,6 +843,7 @@ "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", + "FIELD_HEADER_TIMEOUT" : "Connection timeout:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", "FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING" : "@:APP.FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING",