GUACAMOLE-514: Client-side fields and translations for VNC authentication.
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 cc0a75a..b1b3b75 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
@@ -20,8 +20,28 @@
"name" : "authentication",
"fields" : [
{
+ "name" : "username",
+ "type" : "TEXT"
+ },
+ {
"name" : "password",
"type" : "PASSWORD"
+ },
+ {
+ "name" : "client-cert",
+ "type" : "MULTILINE"
+ },
+ {
+ "name" : "client-key",
+ "type" : "MULTILINE"
+ },
+ {
+ "name" : "ca-cert",
+ "type" : "MULTILINE"
+ },
+ {
+ "name" : "ca-crl",
+ "type" : "TEXT"
}
]
},
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index adbae7a..cbe06b2 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -647,6 +647,10 @@
"PROTOCOL_VNC" : {
"FIELD_HEADER_AUDIO_SERVERNAME" : "Audio server name:",
+ "FIELD_HEADER_CA_CERT" : "CA certificate:",
+ "FIELD_HEADER_CA_CRL" : "CA CRL location:",
+ "FIELD_HEADER_CLIENT_CERT" : "Client certificate:",
+ "FIELD_HEADER_CLIENT_KEY" : "Client private key:",
"FIELD_HEADER_CLIPBOARD_ENCODING" : "Encoding:",
"FIELD_HEADER_COLOR_DEPTH" : "Color depth:",
"FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
@@ -677,6 +681,7 @@
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:",
+ "FIELD_HEADER_USERNAME" : "Username:",
"FIELD_OPTION_COLOR_DEPTH_8" : "256 color",
"FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)",
