From cc466f793541488fe11da7c1e28075b85e26cd8a Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 19 Jun 2020 08:31:05 -0400 Subject: [PATCH] GUACAMOLE-513: Add Wake-on-LAN options and translations. --- .../org/apache/guacamole/protocols/rdp.json | 23 +++++++++++++++ .../org/apache/guacamole/protocols/ssh.json | 23 +++++++++++++++ .../apache/guacamole/protocols/telnet.json | 23 +++++++++++++++ .../org/apache/guacamole/protocols/vnc.json | 23 +++++++++++++++ .../src/main/webapp/translations/en.json | 29 ++++++++++++++++--- 5 files changed, 117 insertions(+), 4 deletions(-) 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 787afe773..048122741 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 @@ -419,6 +419,29 @@ "options" : [ "true" ] } ] + }, + + { + "name" : "wol", + "fields" : [ + { + "name" : "wol-send-packet", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "wol-mac-addr", + "type" : "TEXT" + }, + { + "name" : "wol-broadcast-addr", + "type" : "TEXT" + }, + { + "name" : "wol-wait-time", + "type" : "NUMERIC" + } + ] } ], 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 c57cc4f11..2f12074e5 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 @@ -201,6 +201,29 @@ "options" : [ "true" ] } ] + }, + + { + "name" : "wol", + "fields" : [ + { + "name" : "wol-send-packet", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "wol-mac-addr", + "type" : "TEXT" + }, + { + "name" : "wol-broadcast-addr", + "type" : "TEXT" + }, + { + "name" : "wol-wait-time", + "type" : "NUMERIC" + } + ] } ], diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json index 0f70f0503..6effe32e1 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json @@ -158,6 +158,29 @@ "options" : [ "true" ] } ] + }, + + { + "name" : "wol", + "fields" : [ + { + "name" : "wol-send-packet", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "wol-mac-addr", + "type" : "TEXT" + }, + { + "name" : "wol-broadcast-addr", + "type" : "TEXT" + }, + { + "name" : "wol-wait-time", + "type" : "NUMERIC" + } + ] } ], 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 f8ffec565..a0f33099a 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 @@ -199,6 +199,29 @@ "type" : "TEXT" } ] + }, + + { + "name" : "wol", + "fields" : [ + { + "name" : "wol-send-packet", + "type" : "BOOLEAN", + "options" : [ "true" ] + }, + { + "name" : "wol-mac-addr", + "type" : "TEXT" + }, + { + "name" : "wol-broadcast-addr", + "type" : "TEXT" + }, + { + "name" : "wol-wait-time", + "type" : "NUMERIC" + } + ] } ], diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index d172ac55a..47e4b717b 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -522,6 +522,11 @@ "FIELD_HEADER_TIMEZONE" : "Time zone:", "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_WIDTH" : "Width:", + "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", + "FIELD_HEADER_WOL_MAC_ADDR" : "MAC address of the remote host:", + "FIELD_HEADER_WOL_SEND_PACKET" : "Send WoL packet:", + "FIELD_HEADER_WOL_WAIT_TIME" : "Host boot wait time:", + "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)", "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-bit)", @@ -573,7 +578,8 @@ "SECTION_HEADER_PRECONNECTION_PDU" : "Preconnection PDU / Hyper-V", "SECTION_HEADER_RECORDING" : "Screen Recording", "SECTION_HEADER_REMOTEAPP" : "RemoteApp", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_SFTP" : "SFTP", + "SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)" }, @@ -612,6 +618,10 @@ "FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", + "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", + "FIELD_HEADER_WOL_MAC_ADDR" : "MAC address of the remote host:", + "FIELD_HEADER_WOL_SEND_PACKET" : "Send WoL packet:", + "FIELD_HEADER_WOL_WAIT_TIME" : "Host boot wait time:", "FIELD_OPTION_BACKSPACE_EMPTY" : "", "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", @@ -657,7 +667,8 @@ "SECTION_HEADER_RECORDING" : "Screen Recording", "SECTION_HEADER_SESSION" : "Session / Environment", "SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_SFTP" : "SFTP", + "SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)" }, @@ -689,6 +700,10 @@ "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", + "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", + "FIELD_HEADER_WOL_MAC_ADDR" : "MAC address of the remote host:", + "FIELD_HEADER_WOL_SEND_PACKET" : "Send WoL packet:", + "FIELD_HEADER_WOL_WAIT_TIME" : "Host boot wait time:", "FIELD_OPTION_BACKSPACE_EMPTY" : "", "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", @@ -732,7 +747,8 @@ "SECTION_HEADER_DISPLAY" : "Display", "SECTION_HEADER_RECORDING" : "Screen Recording", "SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)", - "SECTION_HEADER_NETWORK" : "Network" + "SECTION_HEADER_NETWORK" : "Network", + "SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)" }, @@ -772,6 +788,10 @@ "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:", + "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", + "FIELD_HEADER_WOL_MAC_ADDR" : "MAC address of the remote host:", + "FIELD_HEADER_WOL_SEND_PACKET" : "Send WoL packet:", + "FIELD_HEADER_WOL_WAIT_TIME" : "Host boot wait time:", "FIELD_OPTION_COLOR_DEPTH_8" : "256 color", "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-bit)", @@ -798,7 +818,8 @@ "SECTION_HEADER_NETWORK" : "Network", "SECTION_HEADER_RECORDING" : "Screen Recording", "SECTION_HEADER_REPEATER" : "VNC Repeater", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_SFTP" : "SFTP", + "SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)" },