From f017e805ee43a35c8a3b839977a43d68c68e4db0 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 2 Aug 2019 23:32:39 -0400 Subject: [PATCH 1/3] GUACAMOLE-514: Client-side fields and translations for VNC authentication. --- .../org/apache/guacamole/protocols/vnc.json | 20 +++++++++++++++++++ .../src/main/webapp/translations/en.json | 5 +++++ 2 files changed, 25 insertions(+) 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 cc0a75a09..b1b3b75f3 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 @@ -19,9 +19,29 @@ { "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 adbae7a57..cbe06b2aa 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)", From 3a8745dd52035db8c18bf1d3e641d141b716ec06 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Thu, 8 Aug 2019 16:23:27 -0400 Subject: [PATCH 2/3] GUACAMOLE-514: Remove x509 additions. --- .../org/apache/guacamole/protocols/vnc.json | 16 ---------------- guacamole/src/main/webapp/translations/en.json | 4 ---- 2 files changed, 20 deletions(-) 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 b1b3b75f3..4ee432e3b 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 @@ -26,22 +26,6 @@ { "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 cbe06b2aa..f29f3ceea 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -647,10 +647,6 @@ "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:", From 9715ab12eb9ad5550be2bfaa040573d8652a8c06 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 23 Aug 2019 21:05:48 -0400 Subject: [PATCH 3/3] GUACAMOLE-514: Correct username field type and add translations. --- .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 2 +- guacamole/src/main/webapp/translations/cz.json | 1 + guacamole/src/main/webapp/translations/de.json | 1 + guacamole/src/main/webapp/translations/en.json | 2 +- guacamole/src/main/webapp/translations/es.json | 1 + guacamole/src/main/webapp/translations/fr.json | 1 + guacamole/src/main/webapp/translations/it.json | 1 + guacamole/src/main/webapp/translations/ja.json | 1 + guacamole/src/main/webapp/translations/nl.json | 1 + guacamole/src/main/webapp/translations/no.json | 1 + guacamole/src/main/webapp/translations/ru.json | 1 + guacamole/src/main/webapp/translations/zh.json | 1 + 12 files changed, 12 insertions(+), 2 deletions(-) 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 4ee432e3b..117053ced 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 @@ -21,7 +21,7 @@ "fields" : [ { "name" : "username", - "type" : "TEXT" + "type" : "USERNAME" }, { "name" : "password", diff --git a/guacamole/src/main/webapp/translations/cz.json b/guacamole/src/main/webapp/translations/cz.json index be916dd86..6f406d0fd 100644 --- a/guacamole/src/main/webapp/translations/cz.json +++ b/guacamole/src/main/webapp/translations/cz.json @@ -647,6 +647,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Zapnout audio", "FIELD_HEADER_ENABLE_SFTP" : "Povolit SFTP:", "FIELD_HEADER_HOSTNAME" : "Jméno hostitele:", + "FIELD_HEADER_USERNAME" : "Uživatelské jméno:", "FIELD_HEADER_PASSWORD" : "Heslo:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Pouze čtení:", diff --git a/guacamole/src/main/webapp/translations/de.json b/guacamole/src/main/webapp/translations/de.json index 6f73f5c67..c62edef79 100644 --- a/guacamole/src/main/webapp/translations/de.json +++ b/guacamole/src/main/webapp/translations/de.json @@ -468,6 +468,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Aktiviere Audio:", "FIELD_HEADER_ENABLE_SFTP" : "Aktiviere SFTP:", "FIELD_HEADER_HOSTNAME" : "Hostname:", + "FIELD_HEADER_USERNAME" : "Benutzername:", "FIELD_HEADER_PASSWORD" : "Passwort:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Nur-Lesen:", diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index f29f3ceea..598fd9ed0 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -658,6 +658,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Enable audio:", "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", "FIELD_HEADER_HOSTNAME" : "Hostname:", + "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Read-only:", @@ -677,7 +678,6 @@ "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)", diff --git a/guacamole/src/main/webapp/translations/es.json b/guacamole/src/main/webapp/translations/es.json index 903c642d9..a3dfc5a22 100644 --- a/guacamole/src/main/webapp/translations/es.json +++ b/guacamole/src/main/webapp/translations/es.json @@ -533,6 +533,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Habilitar audio:", "FIELD_HEADER_ENABLE_SFTP" : "Habilitar SFTP:", "FIELD_HEADER_HOSTNAME" : "Nombre de Host:", + "FIELD_HEADER_USERNAME" : "Usuario:", "FIELD_HEADER_PASSWORD" : "Contraseña:", "FIELD_HEADER_PORT" : "Puerto:", "FIELD_HEADER_READ_ONLY" : "Solo Lectura:", diff --git a/guacamole/src/main/webapp/translations/fr.json b/guacamole/src/main/webapp/translations/fr.json index 00cee9513..cc3e5841b 100644 --- a/guacamole/src/main/webapp/translations/fr.json +++ b/guacamole/src/main/webapp/translations/fr.json @@ -471,6 +471,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Activer son:", "FIELD_HEADER_ENABLE_SFTP" : "Activer SFTP:", "FIELD_HEADER_HOSTNAME" : "Nom d'hôte:", + "FIELD_HEADER_USERNAME" : "Identifiant:", "FIELD_HEADER_PASSWORD" : "Mot de passe:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Lecture seule:", diff --git a/guacamole/src/main/webapp/translations/it.json b/guacamole/src/main/webapp/translations/it.json index 296ab2620..7437b3125 100644 --- a/guacamole/src/main/webapp/translations/it.json +++ b/guacamole/src/main/webapp/translations/it.json @@ -427,6 +427,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Enable audio:", "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", "FIELD_HEADER_HOSTNAME" : "Hostname:", + "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_PASSWORD" : "Password:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Read-only:", diff --git a/guacamole/src/main/webapp/translations/ja.json b/guacamole/src/main/webapp/translations/ja.json index e3bad5e32..c95590248 100644 --- a/guacamole/src/main/webapp/translations/ja.json +++ b/guacamole/src/main/webapp/translations/ja.json @@ -525,6 +525,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "オーディオの有効化:", "FIELD_HEADER_ENABLE_SFTP" : "SFTPの有効化:", "FIELD_HEADER_HOSTNAME" : "ホスト名:", + "FIELD_HEADER_USERNAME" : "ユーザ名:", "FIELD_HEADER_PASSWORD" : "パスワード:", "FIELD_HEADER_PORT" : "ポート:", "FIELD_HEADER_READ_ONLY" : "読み取り専用:", diff --git a/guacamole/src/main/webapp/translations/nl.json b/guacamole/src/main/webapp/translations/nl.json index 27e3eef88..6d8bb1ecd 100644 --- a/guacamole/src/main/webapp/translations/nl.json +++ b/guacamole/src/main/webapp/translations/nl.json @@ -498,6 +498,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Inschakelen geluid:", "FIELD_HEADER_ENABLE_SFTP" : "Inschakelen SFTP:", "FIELD_HEADER_HOSTNAME" : "Servernaam:", + "FIELD_HEADER_USERNAME" : "Gebruikersnaam:", "FIELD_HEADER_PASSWORD" : "Wachtwoord:", "FIELD_HEADER_PORT" : "Poort:", "FIELD_HEADER_READ_ONLY" : "Alleen lezen:", diff --git a/guacamole/src/main/webapp/translations/no.json b/guacamole/src/main/webapp/translations/no.json index 79d34dd21..1cfcd2524 100644 --- a/guacamole/src/main/webapp/translations/no.json +++ b/guacamole/src/main/webapp/translations/no.json @@ -479,6 +479,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Aktiver lyd:", "FIELD_HEADER_ENABLE_SFTP" : "Aktiver SFTP:", "FIELD_HEADER_HOSTNAME" : "Servernavn:", + "FIELD_HEADER_USERNAME" : "Brukernavn:", "FIELD_HEADER_PASSWORD" : "Passord:", "FIELD_HEADER_PORT" : "Port:", "FIELD_HEADER_READ_ONLY" : "Skrivebeskyttet:", diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index 9e53f66ce..63df9586e 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -415,6 +415,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "Включить звук:", "FIELD_HEADER_ENABLE_SFTP" : "Включить SFTP:", "FIELD_HEADER_HOSTNAME" : "Название сервера:", + "FIELD_HEADER_USERNAME" : "Имя пользователя:", "FIELD_HEADER_PASSWORD" : "Пароль:", "FIELD_HEADER_PORT" : "Порт:", "FIELD_HEADER_READ_ONLY" : "Только просмотр:", diff --git a/guacamole/src/main/webapp/translations/zh.json b/guacamole/src/main/webapp/translations/zh.json index cf25245ae..d8ad3d3b6 100644 --- a/guacamole/src/main/webapp/translations/zh.json +++ b/guacamole/src/main/webapp/translations/zh.json @@ -562,6 +562,7 @@ "FIELD_HEADER_ENABLE_AUDIO" : "启用音频：", "FIELD_HEADER_ENABLE_SFTP" : "启用SFTP：", "FIELD_HEADER_HOSTNAME" : "主机名：", + "FIELD_HEADER_USERNAME" : "用户名：", "FIELD_HEADER_PASSWORD" : "密码：", "FIELD_HEADER_PORT" : "端口：", "FIELD_HEADER_READ_ONLY" : "只读：",