Repository: guacamole-client Updated Branches: refs/heads/master d67efbaf0 -> d1e928bea
GUACAMOLE-527: Add fields for known host key for servers. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/50e3e4ab Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/50e3e4ab Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/50e3e4ab Branch: refs/heads/master Commit: 50e3e4ab94d18548a99a16b3860daae10564a4e3 Parents: bc1dc41 Author: Nick Couchman <vn...@apache.org> Authored: Thu Apr 5 06:32:31 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Mon Jun 25 08:42:33 2018 -0400 ---------------------------------------------------------------------- .../org/apache/guacamole/protocols/rdp.json | 4 ++++ .../org/apache/guacamole/protocols/ssh.json | 4 ++++ .../org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 23 +++++++++++--------- 4 files changed, 25 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/50e3e4ab/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json ---------------------------------------------------------------------- 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 8f0c5ac..96f773f 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 @@ -330,6 +330,10 @@ "type" : "TEXT" }, { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, + { "name" : "sftp-port", "type" : "NUMERIC" }, http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/50e3e4ab/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json ---------------------------------------------------------------------- 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 c7f3dc4..0b01a2a 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" } ] }, http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/50e3e4ab/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json ---------------------------------------------------------------------- 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 3f9f60b..6410cfe 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 @@ -124,6 +124,10 @@ "type" : "TEXT" }, { + "name" : "sftp-host-key", + "type" : "MULTILINE" + }, + { "name" : "sftp-port", "type" : "NUMERIC" }, http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/50e3e4ab/guacamole/src/main/webapp/translations/en.json ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 56bf614..4b90d61 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:",
