Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUACAMOLE-312: Add client-side options for SSH tunneling. #1003

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,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
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 @@ -938,6 +981,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 @@ -995,6 +1047,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
Loading