mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 09:27:59 +00:00
0d3bb73608
This introduces a new entry to the radio-button list of proxy types, in which the 'Proxy host' box is taken to be the name of an SSH server or saved session. We make an entire subsidiary SSH connection to that host, open a direct-tcpip channel through it, and use that as the connection over which to run the primary network connection. The result is basically the same as if you used a local proxy subprocess, with a command along the lines of 'plink -batch %proxyhost -nc %host:%port'. But it's all done in-process, by having an SshProxy object implement the Socket trait to talk to the main connection, and implement Seat and LogPolicy to talk to its subsidiary SSH backend. All the refactoring in recent years has got us to the point where we can do that without both SSH instances fighting over some global variable or unique piece of infrastructure. From an end user perspective, doing SSH proxying in-process like this is a little bit easier to set up: it doesn't require you to bake the full pathname of Plink into your saved session (or to have it on the system PATH), and the SshProxy setup function automatically turns off SSH features that would be inappropriate in this context, such as additional port forwardings, or acting as a connection-sharing upstream. And it has minor advantages like getting the Event Log for the subsidiary connection interleaved in the main Event Log, as if it were stderr output from a proxy subcommand, without having to deliberately configure the subsidiary Plink into verbose mode. However, this is an initial implementation only, and it doesn't yet support the _big_ payoff for doing this in-process, which (I hope) will be the ability to handle interactive prompts from the subsidiary SSH connection via the same user interface as the primary one. For example, you might need to answer two password prompts in succession, or (the first time you use a session configured this way) confirm the host keys for both proxy and destination SSH servers. Comments in the new source file discuss some design thoughts on filling in this gap. For the moment, if the proxy SSH connection encounters any situation where an interactive prompt is needed, it will make the safe assumption, the same way 'plink -batch' would do. So it's at least no _worse_ than the existing technique of putting the proxy connection in a subprocess.
408 lines
16 KiB
C
408 lines
16 KiB
C
/*
|
|
* wincfg.c - the Windows-specific parts of the PuTTY configuration
|
|
* box.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "putty.h"
|
|
#include "dialog.h"
|
|
#include "storage.h"
|
|
|
|
static void about_handler(union control *ctrl, dlgparam *dlg,
|
|
void *data, int event)
|
|
{
|
|
HWND *hwndp = (HWND *)ctrl->generic.context.p;
|
|
|
|
if (event == EVENT_ACTION) {
|
|
modal_about_box(*hwndp);
|
|
}
|
|
}
|
|
|
|
static void help_handler(union control *ctrl, dlgparam *dlg,
|
|
void *data, int event)
|
|
{
|
|
HWND *hwndp = (HWND *)ctrl->generic.context.p;
|
|
|
|
if (event == EVENT_ACTION) {
|
|
show_help(*hwndp);
|
|
}
|
|
}
|
|
|
|
static void variable_pitch_handler(union control *ctrl, dlgparam *dlg,
|
|
void *data, int event)
|
|
{
|
|
if (event == EVENT_REFRESH) {
|
|
dlg_checkbox_set(ctrl, dlg, !dlg_get_fixed_pitch_flag(dlg));
|
|
} else if (event == EVENT_VALCHANGE) {
|
|
dlg_set_fixed_pitch_flag(dlg, !dlg_checkbox_get(ctrl, dlg));
|
|
}
|
|
}
|
|
|
|
void win_setup_config_box(struct controlbox *b, HWND *hwndp, bool has_help,
|
|
bool midsession, int protocol)
|
|
{
|
|
const struct BackendVtable *backvt;
|
|
bool resize_forbidden = false;
|
|
struct controlset *s;
|
|
union control *c;
|
|
char *str;
|
|
|
|
if (!midsession) {
|
|
/*
|
|
* Add the About and Help buttons to the standard panel.
|
|
*/
|
|
s = ctrl_getset(b, "", "", "");
|
|
c = ctrl_pushbutton(s, "About", 'a', HELPCTX(no_help),
|
|
about_handler, P(hwndp));
|
|
c->generic.column = 0;
|
|
if (has_help) {
|
|
c = ctrl_pushbutton(s, "Help", 'h', HELPCTX(no_help),
|
|
help_handler, P(hwndp));
|
|
c->generic.column = 1;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Full-screen mode is a Windows peculiarity; hence
|
|
* scrollbar_in_fullscreen is as well.
|
|
*/
|
|
s = ctrl_getset(b, "Window", "scrollback",
|
|
"Control the scrollback in the window");
|
|
ctrl_checkbox(s, "Display scrollbar in full screen mode", 'i',
|
|
HELPCTX(window_scrollback),
|
|
conf_checkbox_handler,
|
|
I(CONF_scrollbar_in_fullscreen));
|
|
/*
|
|
* Really this wants to go just after `Display scrollbar'. See
|
|
* if we can find that control, and do some shuffling.
|
|
*/
|
|
{
|
|
int i;
|
|
for (i = 0; i < s->ncontrols; i++) {
|
|
c = s->ctrls[i];
|
|
if (c->generic.type == CTRL_CHECKBOX &&
|
|
c->generic.context.i == CONF_scrollbar) {
|
|
/*
|
|
* Control i is the scrollbar checkbox.
|
|
* Control s->ncontrols-1 is the scrollbar-in-FS one.
|
|
*/
|
|
if (i < s->ncontrols-2) {
|
|
c = s->ctrls[s->ncontrols-1];
|
|
memmove(s->ctrls+i+2, s->ctrls+i+1,
|
|
(s->ncontrols-i-2)*sizeof(union control *));
|
|
s->ctrls[i+1] = c;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Windows has the AltGr key, which has various Windows-
|
|
* specific options.
|
|
*/
|
|
s = ctrl_getset(b, "Terminal/Keyboard", "features",
|
|
"Enable extra keyboard features:");
|
|
ctrl_checkbox(s, "AltGr acts as Compose key", 't',
|
|
HELPCTX(keyboard_compose),
|
|
conf_checkbox_handler, I(CONF_compose_key));
|
|
ctrl_checkbox(s, "Control-Alt is different from AltGr", 'd',
|
|
HELPCTX(keyboard_ctrlalt),
|
|
conf_checkbox_handler, I(CONF_ctrlaltkeys));
|
|
|
|
/*
|
|
* Windows allows an arbitrary .WAV to be played as a bell, and
|
|
* also the use of the PC speaker. For this we must search the
|
|
* existing controlset for the radio-button set controlling the
|
|
* `beep' option, and add extra buttons to it.
|
|
*
|
|
* Note that although this _looks_ like a hideous hack, it's
|
|
* actually all above board. The well-defined interface to the
|
|
* per-platform dialog box code is the _data structures_ `union
|
|
* control', `struct controlset' and so on; so code like this
|
|
* that reaches into those data structures and changes bits of
|
|
* them is perfectly legitimate and crosses no boundaries. All
|
|
* the ctrl_* routines that create most of the controls are
|
|
* convenient shortcuts provided on the cross-platform side of
|
|
* the interface, and template creation code is under no actual
|
|
* obligation to use them.
|
|
*/
|
|
s = ctrl_getset(b, "Terminal/Bell", "style", "Set the style of bell");
|
|
{
|
|
int i;
|
|
for (i = 0; i < s->ncontrols; i++) {
|
|
c = s->ctrls[i];
|
|
if (c->generic.type == CTRL_RADIO &&
|
|
c->generic.context.i == CONF_beep) {
|
|
assert(c->generic.handler == conf_radiobutton_handler);
|
|
c->radio.nbuttons += 2;
|
|
c->radio.buttons =
|
|
sresize(c->radio.buttons, c->radio.nbuttons, char *);
|
|
c->radio.buttons[c->radio.nbuttons-1] =
|
|
dupstr("Play a custom sound file");
|
|
c->radio.buttons[c->radio.nbuttons-2] =
|
|
dupstr("Beep using the PC speaker");
|
|
c->radio.buttondata =
|
|
sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
|
|
c->radio.buttondata[c->radio.nbuttons-1] = I(BELL_WAVEFILE);
|
|
c->radio.buttondata[c->radio.nbuttons-2] = I(BELL_PCSPEAKER);
|
|
if (c->radio.shortcuts) {
|
|
c->radio.shortcuts =
|
|
sresize(c->radio.shortcuts, c->radio.nbuttons, char);
|
|
c->radio.shortcuts[c->radio.nbuttons-1] = NO_SHORTCUT;
|
|
c->radio.shortcuts[c->radio.nbuttons-2] = NO_SHORTCUT;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
ctrl_filesel(s, "Custom sound file to play as a bell:", NO_SHORTCUT,
|
|
FILTER_WAVE_FILES, false, "Select bell sound file",
|
|
HELPCTX(bell_style),
|
|
conf_filesel_handler, I(CONF_bell_wavefile));
|
|
|
|
/*
|
|
* While we've got this box open, taskbar flashing on a bell is
|
|
* also Windows-specific.
|
|
*/
|
|
ctrl_radiobuttons(s, "Taskbar/caption indication on bell:", 'i', 3,
|
|
HELPCTX(bell_taskbar),
|
|
conf_radiobutton_handler,
|
|
I(CONF_beep_ind),
|
|
"Disabled", I(B_IND_DISABLED),
|
|
"Flashing", I(B_IND_FLASH),
|
|
"Steady", I(B_IND_STEADY), NULL);
|
|
|
|
/*
|
|
* The sunken-edge border is a Windows GUI feature.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Appearance", "border",
|
|
"Adjust the window border");
|
|
ctrl_checkbox(s, "Sunken-edge border (slightly thicker)", 's',
|
|
HELPCTX(appearance_border),
|
|
conf_checkbox_handler, I(CONF_sunken_edge));
|
|
|
|
/*
|
|
* Configurable font quality settings for Windows.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Appearance", "font",
|
|
"Font settings");
|
|
ctrl_checkbox(s, "Allow selection of variable-pitch fonts", NO_SHORTCUT,
|
|
HELPCTX(appearance_font), variable_pitch_handler, I(0));
|
|
ctrl_radiobuttons(s, "Font quality:", 'q', 2,
|
|
HELPCTX(appearance_font),
|
|
conf_radiobutton_handler,
|
|
I(CONF_font_quality),
|
|
"Antialiased", I(FQ_ANTIALIASED),
|
|
"Non-Antialiased", I(FQ_NONANTIALIASED),
|
|
"ClearType", I(FQ_CLEARTYPE),
|
|
"Default", I(FQ_DEFAULT), NULL);
|
|
|
|
/*
|
|
* Cyrillic Lock is a horrid misfeature even on Windows, and
|
|
* the least we can do is ensure it never makes it to any other
|
|
* platform (at least unless someone fixes it!).
|
|
*/
|
|
s = ctrl_getset(b, "Window/Translation", "tweaks", NULL);
|
|
ctrl_checkbox(s, "Caps Lock acts as Cyrillic switch", 's',
|
|
HELPCTX(translation_cyrillic),
|
|
conf_checkbox_handler,
|
|
I(CONF_xlat_capslockcyr));
|
|
|
|
/*
|
|
* On Windows we can use but not enumerate translation tables
|
|
* from the operating system. Briefly document this.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Translation", "trans",
|
|
"Character set translation on received data");
|
|
ctrl_text(s, "(Codepages supported by Windows but not listed here, "
|
|
"such as CP866 on many systems, can be entered manually)",
|
|
HELPCTX(translation_codepage));
|
|
|
|
/*
|
|
* Windows has the weird OEM font mode, which gives us some
|
|
* additional options when working with line-drawing
|
|
* characters.
|
|
*/
|
|
str = dupprintf("Adjust how %s displays line drawing characters", appname);
|
|
s = ctrl_getset(b, "Window/Translation", "linedraw", str);
|
|
sfree(str);
|
|
{
|
|
int i;
|
|
for (i = 0; i < s->ncontrols; i++) {
|
|
c = s->ctrls[i];
|
|
if (c->generic.type == CTRL_RADIO &&
|
|
c->generic.context.i == CONF_vtmode) {
|
|
assert(c->generic.handler == conf_radiobutton_handler);
|
|
c->radio.nbuttons += 3;
|
|
c->radio.buttons =
|
|
sresize(c->radio.buttons, c->radio.nbuttons, char *);
|
|
c->radio.buttons[c->radio.nbuttons-3] =
|
|
dupstr("Font has XWindows encoding");
|
|
c->radio.buttons[c->radio.nbuttons-2] =
|
|
dupstr("Use font in both ANSI and OEM modes");
|
|
c->radio.buttons[c->radio.nbuttons-1] =
|
|
dupstr("Use font in OEM mode only");
|
|
c->radio.buttondata =
|
|
sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
|
|
c->radio.buttondata[c->radio.nbuttons-3] = I(VT_XWINDOWS);
|
|
c->radio.buttondata[c->radio.nbuttons-2] = I(VT_OEMANSI);
|
|
c->radio.buttondata[c->radio.nbuttons-1] = I(VT_OEMONLY);
|
|
if (!c->radio.shortcuts) {
|
|
int j;
|
|
c->radio.shortcuts = snewn(c->radio.nbuttons, char);
|
|
for (j = 0; j < c->radio.nbuttons; j++)
|
|
c->radio.shortcuts[j] = NO_SHORTCUT;
|
|
} else {
|
|
c->radio.shortcuts = sresize(c->radio.shortcuts,
|
|
c->radio.nbuttons, char);
|
|
}
|
|
c->radio.shortcuts[c->radio.nbuttons-3] = 'x';
|
|
c->radio.shortcuts[c->radio.nbuttons-2] = 'b';
|
|
c->radio.shortcuts[c->radio.nbuttons-1] = 'e';
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* RTF paste is Windows-specific.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Selection/Copy", "format",
|
|
"Formatting of copied characters");
|
|
ctrl_checkbox(s, "Copy to clipboard in RTF as well as plain text", 'f',
|
|
HELPCTX(copy_rtf),
|
|
conf_checkbox_handler, I(CONF_rtf_paste));
|
|
|
|
/*
|
|
* Windows often has no middle button, so we supply a selection
|
|
* mode in which the more critical Paste action is available on
|
|
* the right button instead.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Selection", "mouse",
|
|
"Control use of mouse");
|
|
ctrl_radiobuttons(s, "Action of mouse buttons:", 'm', 1,
|
|
HELPCTX(selection_buttons),
|
|
conf_radiobutton_handler,
|
|
I(CONF_mouse_is_xterm),
|
|
"Windows (Middle extends, Right brings up menu)", I(2),
|
|
"Compromise (Middle extends, Right pastes)", I(0),
|
|
"xterm (Right extends, Middle pastes)", I(1), NULL);
|
|
/*
|
|
* This really ought to go at the _top_ of its box, not the
|
|
* bottom, so we'll just do some shuffling now we've set it
|
|
* up...
|
|
*/
|
|
c = s->ctrls[s->ncontrols-1]; /* this should be the new control */
|
|
memmove(s->ctrls+1, s->ctrls, (s->ncontrols-1)*sizeof(union control *));
|
|
s->ctrls[0] = c;
|
|
|
|
/*
|
|
* Logical palettes don't even make sense anywhere except Windows.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Colours", "general",
|
|
"General options for colour usage");
|
|
ctrl_checkbox(s, "Attempt to use logical palettes", 'l',
|
|
HELPCTX(colours_logpal),
|
|
conf_checkbox_handler, I(CONF_try_palette));
|
|
ctrl_checkbox(s, "Use system colours", 's',
|
|
HELPCTX(colours_system),
|
|
conf_checkbox_handler, I(CONF_system_colour));
|
|
|
|
|
|
/*
|
|
* Resize-by-changing-font is a Windows insanity.
|
|
*/
|
|
|
|
backvt = backend_vt_from_proto(protocol);
|
|
if (backvt)
|
|
resize_forbidden = (backvt->flags & BACKEND_RESIZE_FORBIDDEN);
|
|
if (!midsession || !resize_forbidden) {
|
|
s = ctrl_getset(b, "Window", "size", "Set the size of the window");
|
|
ctrl_radiobuttons(s, "When window is resized:", 'z', 1,
|
|
HELPCTX(window_resize),
|
|
conf_radiobutton_handler,
|
|
I(CONF_resize_action),
|
|
"Change the number of rows and columns", I(RESIZE_TERM),
|
|
"Change the size of the font", I(RESIZE_FONT),
|
|
"Change font size only when maximised", I(RESIZE_EITHER),
|
|
"Forbid resizing completely", I(RESIZE_DISABLED), NULL);
|
|
}
|
|
|
|
/*
|
|
* Most of the Window/Behaviour stuff is there to mimic Windows
|
|
* conventions which PuTTY can optionally disregard. Hence,
|
|
* most of these options are Windows-specific.
|
|
*/
|
|
s = ctrl_getset(b, "Window/Behaviour", "main", NULL);
|
|
ctrl_checkbox(s, "Window closes on ALT-F4", '4',
|
|
HELPCTX(behaviour_altf4),
|
|
conf_checkbox_handler, I(CONF_alt_f4));
|
|
ctrl_checkbox(s, "System menu appears on ALT-Space", 'y',
|
|
HELPCTX(behaviour_altspace),
|
|
conf_checkbox_handler, I(CONF_alt_space));
|
|
ctrl_checkbox(s, "System menu appears on ALT alone", 'l',
|
|
HELPCTX(behaviour_altonly),
|
|
conf_checkbox_handler, I(CONF_alt_only));
|
|
ctrl_checkbox(s, "Ensure window is always on top", 'e',
|
|
HELPCTX(behaviour_alwaysontop),
|
|
conf_checkbox_handler, I(CONF_alwaysontop));
|
|
ctrl_checkbox(s, "Full screen on Alt-Enter", 'f',
|
|
HELPCTX(behaviour_altenter),
|
|
conf_checkbox_handler,
|
|
I(CONF_fullscreenonaltenter));
|
|
|
|
/*
|
|
* Windows supports a local-command proxy. This also means we
|
|
* must adjust the text on the `Telnet command' control.
|
|
*/
|
|
if (!midsession) {
|
|
int i;
|
|
s = ctrl_getset(b, "Connection/Proxy", "basics", NULL);
|
|
for (i = 0; i < s->ncontrols; i++) {
|
|
c = s->ctrls[i];
|
|
if (c->generic.type == CTRL_RADIO &&
|
|
c->generic.context.i == CONF_proxy_type) {
|
|
assert(c->generic.handler == conf_radiobutton_handler);
|
|
c->radio.nbuttons++;
|
|
c->radio.buttons =
|
|
sresize(c->radio.buttons, c->radio.nbuttons, char *);
|
|
c->radio.buttons[c->radio.nbuttons-1] =
|
|
dupstr("Local");
|
|
c->radio.buttondata =
|
|
sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
|
|
c->radio.buttondata[c->radio.nbuttons-1] = I(PROXY_CMD);
|
|
if (c->radio.ncolumns < 4)
|
|
c->radio.ncolumns = 4;
|
|
break;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < s->ncontrols; i++) {
|
|
c = s->ctrls[i];
|
|
if (c->generic.type == CTRL_EDITBOX &&
|
|
c->generic.context.i == CONF_proxy_telnet_command) {
|
|
assert(c->generic.handler == conf_editbox_handler);
|
|
sfree(c->generic.label);
|
|
c->generic.label = dupstr("Telnet command, or local"
|
|
" proxy command");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
* $XAUTHORITY is not reliable on Windows, so we provide a
|
|
* means to override it.
|
|
*/
|
|
if (!midsession && backend_vt_from_proto(PROT_SSH)) {
|
|
s = ctrl_getset(b, "Connection/SSH/X11", "x11", "X11 forwarding");
|
|
ctrl_filesel(s, "X authority file for local display", 't',
|
|
NULL, false, "Select X authority file",
|
|
HELPCTX(ssh_tunnels_xauthority),
|
|
conf_filesel_handler, I(CONF_xauthfile));
|
|
}
|
|
}
|