From d07957f79c05d091f9b5058f56f32a288e76bc75 Mon Sep 17 00:00:00 2001 From: maeda577 Date: Sat, 20 Jan 2024 14:45:20 +0000 Subject: [PATCH 1/6] GUACAMOLE-520: Add mapping of Japanese IME keys. --- guacamole-common-js/src/main/webapp/modules/Keyboard.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js index 62d709cb9..18934ffb4 100644 --- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js +++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js @@ -471,7 +471,7 @@ Guacamole.Keyboard = function Keyboard(element) { "CapsLock": [0xFFE5], "Cancel": [0xFF69], "Clear": [0xFF0B], - "Convert": [0xFF21], + "Convert": [0xFF23], "Copy": [0xFD15], "Crsel": [0xFD1C], "CrSel": [0xFD1C], @@ -538,6 +538,7 @@ Guacamole.Keyboard = function Keyboard(element) { "Left": [0xFF51], "Meta": [0xFFE7, 0xFFE7, 0xFFE8], "ModeChange": [0xFF7E], + "NonConvert": [0xFF22], "NumLock": [0xFF7F], "PageDown": [0xFF56], "PageUp": [0xFF55], @@ -547,6 +548,7 @@ Guacamole.Keyboard = function Keyboard(element) { "PrintScreen": [0xFF61], "Redo": [0xFF66], "Right": [0xFF53], + "Romaji": [0xFF24], "RomanCharacters": null, "Scroll": [0xFF14], "Select": [0xFF60], From b92222c3a09eefa9d5089c0d7e816ecba8039652 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 26 Aug 2024 13:23:15 -0400 Subject: [PATCH 2/6] 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 3/6] 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 4/6] 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", From 24443d6955169375a638f831c10d756cab187d5d Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 14 Jun 2024 22:30:06 -0400 Subject: [PATCH 5/6] GUACAMOLE-1290: Add public key parameter for SSH and SFTP connections. --- .../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 | 3 +++ 4 files changed, 15 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..7175411c8 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 @@ -440,6 +440,10 @@ "name" : "sftp-passphrase", "type" : "PASSWORD" }, + { + "name" : "sftp-public-key", + "type" : "MULTILINE" + }, { "name" : "sftp-root-directory", "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..6920546cd 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 @@ -38,6 +38,10 @@ { "name" : "passphrase", "type" : "PASSWORD" + }, + { + "name" : "public-key", + "type" : "MULTILINE" } ] }, 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..f13c0cc29 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 @@ -195,6 +195,10 @@ "name" : "sftp-passphrase", "type" : "PASSWORD" }, + { + "name" : "sftp-public-key", + "type" : "MULTILINE" + }, { "name" : "sftp-root-directory", "type" : "TEXT" diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index 5b0ff7994..5414028b6 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -643,6 +643,7 @@ "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_PUBLIC_KEY" : "Public key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", @@ -741,6 +742,7 @@ "FIELD_HEADER_PASSPHRASE" : "Passphrase:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_PUBLIC_KEY" : "Public key:", "FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:", "FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_RECORDING_WRITE_EXISTING" : "@:APP.FIELD_HEADER_RECORDING_WRITE_EXISTING", @@ -935,6 +937,7 @@ "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_PUBLIC_KEY" : "Public key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", From 8ecc64b30ea0dea457647662ba58dd6ac64b20c8 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 27 Aug 2024 11:58:29 -0700 Subject: [PATCH 6/6] GUACAMOLE-926: Reorder "Import" button to end to avoid fighting muscle memory. Users that are used to the established Guacamole UI will be used to clicking the leftmost button when attempting to create a new connection, but the leftmost button has changed from "New Connection" to "Import". This change restores that original button order, with "New Connection" being on the far left. --- .../src/app/settings/templates/settingsConnections.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html index e90d30cad..20f0f8268 100644 --- a/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html +++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsConnections.html @@ -9,10 +9,6 @@
- {{'SETTINGS_CONNECTIONS.ACTION_IMPORT' | translate}} - {{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION' | translate}} @@ -21,6 +17,10 @@ ng-show="canCreateConnectionGroups()" href="#/manage/{{dataSource | escape}}/connectionGroups/">{{'SETTINGS_CONNECTIONS.ACTION_NEW_CONNECTION_GROUP' | translate}} + {{'SETTINGS_CONNECTIONS.ACTION_IMPORT' | translate}} +