GUACAMOLE-527: Merge parameter definitions for SSH/SFTP host key.
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..c95fd73 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
@@ -334,6 +334,10 @@
"type" : "NUMERIC"
},
{
+ "name" : "sftp-host-key",
+ "type" : "TEXT"
+ },
+ {
"name" : "sftp-username",
"type" : "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 c7f3dc4..a71e1fb 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" : "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 3f9f60b..bdeaebc 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
@@ -128,6 +128,10 @@
"type" : "NUMERIC"
},
{
+ "name" : "sftp-host-key",
+ "type" : "TEXT"
+ },
+ {
"name" : "sftp-username",
"type" : "USERNAME"
},
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 56bf614..0f242f9 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" : "Public 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" : "Public host key (Base64):",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",
