Skip to content

Commit

Permalink
GUACAMOLE-302: Add client-side options for SSH tunneling.
Browse files Browse the repository at this point in the history
  • Loading branch information
@necouchman
necouchman committed Aug 3, 2024
1 parent deb858a commit 8c455a4
Show file tree
Hide file tree
Showing 5 changed files with 286 additions and 0 deletions.
43 changes: 43 additions & 0 deletions guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,49 @@
]
},

{
"name" : "ssh-tunnel",
"fields" : [
{
"name" : "ssh-tunnel",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "ssh-tunnel-host",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-port",
"type" : "NUMERIC"
},
{
"name" : "ssh-tunnel-host-key",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-username",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-password",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-private-key",
"type" : "MULTILINE"
},
{
"name" : "ssh-tunnel-passphrase",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-alive-interval",
"type" : "NUMERIC"
}
]
},

{
"name" : "wol",
"fields" : [
Expand Down
43 changes: 43 additions & 0 deletions guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,49 @@
]
},

{
"name" : "ssh-tunnel",
"fields" : [
{
"name" : "ssh-tunnel",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "ssh-tunnel-host",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-port",
"type" : "NUMERIC"
},
{
"name" : "ssh-tunnel-host-key",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-username",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-password",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-private-key",
"type" : "MULTILINE"
},
{
"name" : "ssh-tunnel-passphrase",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-alive-interval",
"type" : "NUMERIC"
}
]
},

{
"name" : "wol",
"fields" : [
Expand Down
104 changes: 104 additions & 0 deletions guacamole-ext/src/main/resources/org/apache/guacamole/protocols/telnet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,110 @@
}
]
},

{
"name" : "sftp",
"fields" : [
{
"name" : "enable-sftp",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "sftp-hostname",
"type" : "TEXT"
},
{
"name" : "sftp-port",
"type" : "NUMERIC"
},
{
"name" : "sftp-host-key",
"type" : "TEXT"
},
{
"name" : "sftp-username",
"type" : "USERNAME"
},
{
"name" : "sftp-password",
"type" : "PASSWORD"
},
{
"name" : "sftp-private-key",
"type" : "MULTILINE"
},
{
"name" : "sftp-passphrase",
"type" : "PASSWORD"
},
{
"name" : "sftp-root-directory",
"type" : "TEXT"
},
{
"name" : "sftp-directory",
"type" : "TEXT"
},
{
"name" : "sftp-server-alive-interval",
"type" : "NUMERIC"
},
{
"name" : "sftp-disable-download",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "sftp-disable-upload",
"type" : "BOOLEAN",
"options" : [ "true" ]
}
]
},

{
"name" : "ssh-tunnel",
"fields" : [
{
"name" : "ssh-tunnel",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "ssh-tunnel-host",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-port",
"type" : "NUMERIC"
},
{
"name" : "ssh-tunnel-host-key",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-username",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-password",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-private-key",
"type" : "MULTILINE"
},
{
"name" : "ssh-tunnel-passphrase",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-alive-interval",
"type" : "NUMERIC"
}
]
},

{
"name" : "typescript",
Expand Down
43 changes: 43 additions & 0 deletions guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,49 @@
}
]
},

{
"name" : "ssh-tunnel",
"fields" : [
{
"name" : "ssh-tunnel",
"type" : "BOOLEAN",
"options" : [ "true" ]
},
{
"name" : "ssh-tunnel-host",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-port",
"type" : "NUMERIC"
},
{
"name" : "ssh-tunnel-host-key",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-username",
"type" : "TEXT"
},
{
"name" : "ssh-tunnel-password",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-private-key",
"type" : "MULTILINE"
},
{
"name" : "ssh-tunnel-passphrase",
"type" : "PASSWORD"
},
{
"name" : "ssh-tunnel-alive-interval",
"type" : "NUMERIC"
}
]
},

{
"name" : "audio",
Expand Down
53 changes: 53 additions & 0 deletions guacamole/src/main/frontend/src/translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,15 @@
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_SSH_TUNNEL" : "Enable SSH tunneling:",
"FIELD_HEADER_SSH_TUNNEL_ALIVE_INTERVAL" : "SSH tunnel keepalive interval:",
"FIELD_HEADER_SSH_TUNNEL_HOST" : "Hostname:",
"FIELD_HEADER_SSH_TUNNEL_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SSH_TUNNEL_PASSPHRASE" : "Passphrase for private key:",
"FIELD_HEADER_SSH_TUNNEL_PASSWORD" : "Password",
"FIELD_HEADER_SSH_TUNNEL_PORT" : "Port:",
"FIELD_HEADER_SSH_TUNNEL_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SSH_TUNNEL_USERNAME" : "Username:",
"FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
"FIELD_HEADER_TIMEZONE" : "Time zone:",
"FIELD_HEADER_USERNAME" : "Username:",
Expand Down Expand Up @@ -717,6 +726,7 @@
"SECTION_HEADER_RECORDING" : "Screen Recording",
"SECTION_HEADER_REMOTEAPP" : "RemoteApp",
"SECTION_HEADER_SFTP" : "SFTP",
"SECTION_HEADER_SSH_TUNNEL" : "SSH Tunneling",
"SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)"

},
Expand Down Expand Up @@ -753,6 +763,15 @@
"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_SSH_TUNNEL" : "Enable SSH tunneling:",
"FIELD_HEADER_SSH_TUNNEL_ALIVE_INTERVAL" : "SSH tunnel keepalive interval:",
"FIELD_HEADER_SSH_TUNNEL_HOST" : "Hostname:",
"FIELD_HEADER_SSH_TUNNEL_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SSH_TUNNEL_PASSPHRASE" : "Passphrase for private key:",
"FIELD_HEADER_SSH_TUNNEL_PASSWORD" : "Password",
"FIELD_HEADER_SSH_TUNNEL_PORT" : "Port:",
"FIELD_HEADER_SSH_TUNNEL_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SSH_TUNNEL_USERNAME" : "Username:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
Expand Down Expand Up @@ -809,6 +828,7 @@
"SECTION_HEADER_SESSION" : "Session / Environment",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)",
"SECTION_HEADER_SFTP" : "SFTP",
"SECTION_HEADER_SSH_TUNNEL" : "SSH Tunneling",
"SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)"

},
Expand Down Expand Up @@ -839,6 +859,27 @@
"FIELD_HEADER_RECORDING_NAME" : "Recording name:",
"FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:",
"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:",
"FIELD_HEADER_SFTP_PASSPHRASE" : "Passphrase:",
"FIELD_HEADER_SFTP_PASSWORD" : "Password:",
"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_SSH_TUNNEL" : "Enable SSH tunneling:",
"FIELD_HEADER_SSH_TUNNEL_ALIVE_INTERVAL" : "SSH tunnel keepalive interval:",
"FIELD_HEADER_SSH_TUNNEL_HOST" : "Hostname:",
"FIELD_HEADER_SSH_TUNNEL_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SSH_TUNNEL_PASSPHRASE" : "Passphrase for private key:",
"FIELD_HEADER_SSH_TUNNEL_PASSWORD" : "Password",
"FIELD_HEADER_SSH_TUNNEL_PORT" : "Port:",
"FIELD_HEADER_SSH_TUNNEL_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SSH_TUNNEL_USERNAME" : "Username:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
Expand Down Expand Up @@ -892,6 +933,8 @@
"SECTION_HEADER_RECORDING" : "Screen Recording",
"SECTION_HEADER_TYPESCRIPT" : "Typescript (Text Session Recording)",
"SECTION_HEADER_NETWORK" : "Network",
"SECTION_HEADER_SFTP" : "SFTP",
"SECTION_HEADER_SSH_TUNNEL" : "SSH Tunneling",
"SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)"

},
Expand Down Expand Up @@ -936,6 +979,15 @@
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_SSH_TUNNEL" : "Enable SSH tunneling:",
"FIELD_HEADER_SSH_TUNNEL_ALIVE_INTERVAL" : "SSH tunnel keepalive interval:",
"FIELD_HEADER_SSH_TUNNEL_HOST" : "Hostname:",
"FIELD_HEADER_SSH_TUNNEL_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SSH_TUNNEL_PASSPHRASE" : "Passphrase for private key:",
"FIELD_HEADER_SSH_TUNNEL_PASSWORD" : "Password",
"FIELD_HEADER_SSH_TUNNEL_PORT" : "Port:",
"FIELD_HEADER_SSH_TUNNEL_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SSH_TUNNEL_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:",
Expand Down Expand Up @@ -993,6 +1045,7 @@
"SECTION_HEADER_RECORDING" : "Screen Recording",
"SECTION_HEADER_REPEATER" : "VNC Repeater",
"SECTION_HEADER_SFTP" : "SFTP",
"SECTION_HEADER_SSH_TUNNEL" : "SSH Tunneling",
"SECTION_HEADER_WOL" : "Wake-on-LAN (WoL)"

},
Expand Down

0 comments on commit 8c455a4

Please sign in to comment.