From 69b727e8af5f414931319bd158a6dbaa341fb128 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Wed, 25 Dec 2019 17:57:40 -0500 Subject: [PATCH 1/2] GUACAMOLE-474: Add protocol options for disabling file upload/download. --- .../org/apache/guacamole/protocols/rdp.json | 20 +++++++++++++++++++ .../org/apache/guacamole/protocols/ssh.json | 10 ++++++++++ .../org/apache/guacamole/protocols/vnc.json | 10 ++++++++++ 3 files changed, 40 insertions(+) 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 932cd85e3..981f5ea05 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 @@ -205,6 +205,16 @@ "name" : "drive-name", "type" : "TEXT" }, + { + "name" : "disable-download", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "disable-upload", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, { "name" : "drive-path", "type" : "TEXT" @@ -395,6 +405,16 @@ { "name" : "sftp-server-alive-interval", "type" : "NUMERIC" + }, + { + "name" : "sftp-disable-download", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "sftp-disable-upload", + "type" : "BOOLEAN", + "options" : [ "true" ] } ] } 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 a1d01edab..ba5ce08ca 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 @@ -189,6 +189,16 @@ { "name" : "sftp-root-directory", "type" : "TEXT" + }, + { + "name" : "disable-download", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "disable-upload", + "type" : "BOOLEAN", + "options" : [ "true" ] } ] } 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 117053ced..f8ffec565 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 @@ -172,6 +172,16 @@ { "name" : "sftp-server-alive-interval", "type" : "NUMERIC" + }, + { + "name" : "sftp-disable-download", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "sftp-disable-upload", + "type" : "BOOLEAN", + "options" : [ "true" ] } ] }, From eb2b447e25207ff97bf12a1ff02dfc23ad13fffb Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Wed, 25 Dec 2019 18:03:20 -0500 Subject: [PATCH 2/2] GUACAMOLE-474: Add English translations for file upload/download options. --- .../org/apache/guacamole/protocols/ssh.json | 4 ++-- guacamole/src/main/webapp/translations/en.json | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) 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 ba5ce08ca..c57cc4f11 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 @@ -191,12 +191,12 @@ "type" : "TEXT" }, { - "name" : "disable-download", + "name" : "sftp-disable-download", "type" : "BOOLEAN", "options" : [ "true" ] }, { - "name" : "disable-upload", + "name" : "sftp-disable-upload", "type" : "BOOLEAN", "options" : [ "true" ] } diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 63deae5e4..aafc9e88c 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -458,11 +458,13 @@ "FIELD_HEADER_DISABLE_AUDIO" : "Disable audio:", "FIELD_HEADER_DISABLE_AUTH" : "Disable authentication:", "FIELD_HEADER_DISABLE_COPY" : "Disable copying from remote desktop:", + "FIELD_HEADER_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:", + "FIELD_HEADER_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_DOMAIN" : "Domain:", "FIELD_HEADER_DPI" : "Resolution (DPI):", - "FIELD_HEADER_DRIVE_NAME" : "Drive name:", - "FIELD_HEADER_DRIVE_PATH" : "Drive path:", + "FIELD_HEADER_DRIVE_NAME" : "Drive name:", + "FIELD_HEADER_DRIVE_PATH" : "Drive path:", "FIELD_HEADER_ENABLE_AUDIO_INPUT" : "Enable audio input (microphone):", "FIELD_HEADER_ENABLE_DESKTOP_COMPOSITION" : "Enable desktop composition (Aero):", "FIELD_HEADER_ENABLE_DRIVE" : "Enable drive:", @@ -504,6 +506,7 @@ "FIELD_HEADER_SECURITY" : "Security mode:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", @@ -512,6 +515,7 @@ "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", + "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", "FIELD_HEADER_TIMEZONE" : "Time zone:", @@ -597,7 +601,9 @@ "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:", + "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", + "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", @@ -750,6 +756,7 @@ "FIELD_HEADER_RECORDING_NAME" : "Recording name:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", + "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", @@ -758,6 +765,7 @@ "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", + "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:",