From 50e3e4ab94d18548a99a16b3860daae10564a4e3 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Thu, 5 Apr 2018 06:32:31 -0400 Subject: [PATCH 1/4] GUACAMOLE-527: Add fields for known host key for servers. --- .../org/apache/guacamole/protocols/rdp.json | 4 ++++ .../org/apache/guacamole/protocols/ssh.json | 4 ++++ .../org/apache/guacamole/protocols/vnc.json | 4 ++++ .../src/main/webapp/translations/en.json | 23 +++++++++++-------- 4 files changed, 25 insertions(+), 10 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 8f0c5acc7..96f773feb 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 @@ -329,6 +329,10 @@ "name" : "sftp-hostname", "type" : "TEXT" }, + { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, { "name" : "sftp-port", "type" : "NUMERIC" 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 c7f3dc4c3..0b01a2ace 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 @@ -12,6 +12,10 @@ { "name" : "port", "type" : "NUMERIC" + }, + { + "name" : "host-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 3f9f60b5a..6410cfede 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 @@ -123,6 +123,10 @@ "name" : "sftp-hostname", "type" : "TEXT" }, + { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, { "name" : "sftp-port", "type" : "NUMERIC" diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 56bf614e1..4b90d614e 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -364,6 +364,7 @@ "FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", @@ -430,16 +431,17 @@ "FIELD_HEADER_COMMAND" : "Execute command:", "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:", "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:", - "FIELD_HEADER_FONT_NAME" : "Font name:", - "FIELD_HEADER_FONT_SIZE" : "Font size:", - "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", - "FIELD_HEADER_HOSTNAME" : "Hostname:", - "FIELD_HEADER_USERNAME" : "Username:", - "FIELD_HEADER_PASSWORD" : "Password:", - "FIELD_HEADER_PASSPHRASE" : "Passphrase:", - "FIELD_HEADER_PORT" : "Port:", - "FIELD_HEADER_PRIVATE_KEY" : "Private key:", - "FIELD_HEADER_READ_ONLY" : "Read-only:", + "FIELD_HEADER_FONT_NAME" : "Font name:", + "FIELD_HEADER_FONT_SIZE" : "Font size:", + "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", + "FIELD_HEADER_HOST_KEY" : "Public host key (Base64):", + "FIELD_HEADER_HOSTNAME" : "Hostname:", + "FIELD_HEADER_USERNAME" : "Username:", + "FIELD_HEADER_PASSWORD" : "Password:", + "FIELD_HEADER_PASSPHRASE" : "Passphrase:", + "FIELD_HEADER_PORT" : "Port:", + "FIELD_HEADER_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_READ_ONLY" : "Read-only:", "FIELD_HEADER_RECORDING_EXCLUDE_MOUSE" : "Exclude mouse:", "FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "Exclude graphics/streams:", "FIELD_HEADER_RECORDING_INCLUDE_KEYS" : "Include key events:", @@ -587,6 +589,7 @@ "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", From db8bb9f85a5ed993ba20367e161d102712dd2703 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 26 Jun 2018 15:39:25 -0400 Subject: [PATCH 2/4] GUACAMOLE-527: Correct order of options in RDP and VNC. --- .../resources/org/apache/guacamole/protocols/rdp.json | 8 ++++---- .../resources/org/apache/guacamole/protocols/vnc.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 96f773feb..1eaac893e 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 @@ -329,14 +329,14 @@ "name" : "sftp-hostname", "type" : "TEXT" }, - { - "name" : "sftp-host-key", - "type" : "MULTILINE" - }, { "name" : "sftp-port", "type" : "NUMERIC" }, + { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, { "name" : "sftp-username", "type" : "USERNAME" 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 6410cfede..eed384eff 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 @@ -123,14 +123,14 @@ "name" : "sftp-hostname", "type" : "TEXT" }, - { - "name" : "sftp-host-key", - "type" : "MULTILINE" - }, { "name" : "sftp-port", "type" : "NUMERIC" }, + { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, { "name" : "sftp-username", "type" : "USERNAME" From 39f5cb4a2c724e2539c4c2f50ca80ad787801d39 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 26 Jun 2018 15:41:45 -0400 Subject: [PATCH 3/4] GUACAMOLE-527: Change multiline to single line text field. --- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 2 +- .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 2 +- .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 2 +- 3 files changed, 3 insertions(+), 3 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 1eaac893e..c95fd73cb 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 @@ -335,7 +335,7 @@ }, { "name" : "sftp-host-key", - "type" : "MULTILINE" + "type" : "TEXT" }, { "name" : "sftp-username", 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 0b01a2ace..a71e1fbbc 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 @@ -15,7 +15,7 @@ }, { "name" : "host-key", - "type" : "MULTILINE" + "type" : "TEXT" } ] }, 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 eed384eff..bdeaebcaf 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 @@ -129,7 +129,7 @@ }, { "name" : "sftp-host-key", - "type" : "MULTILINE" + "type" : "TEXT" }, { "name" : "sftp-username", From 0b4245cc650b643897db0037e822a9f60fbf35f8 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 26 Jun 2018 15:43:25 -0400 Subject: [PATCH 4/4] GUACAMOLE-527: Make translation text consistent across SSH and SFTP --- guacamole/src/main/webapp/translations/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 4b90d614e..0f242f9bf 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -364,7 +364,7 @@ "FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", - "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):", + "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:", @@ -589,7 +589,7 @@ "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", - "FIELD_HEADER_SFTP_HOST_KEY" : "SSH host key (Base64):", + "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",