ProxyCommand support for Windows, using the new winhandl.c API.

Seems a bit clunky when I actually try to use it - not sure why -
but I think all the actual functionality is there.

git-svn-id: svn://svn.tartarus.org/sgt/putty@6806 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Recipe b/Recipe
index 7aa0d07..779995f 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -244,7 +244,8 @@ SFTP     = sftp int64 logging
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
 MISC     = timing misc version settings tree234 proxy
-WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc pproxy wintime
+WINMISC  = MISC winstore winnet winhandl cmdline windefs winmisc winproxy
+         + wintime
 UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy time
 OSXMISC  = MISC uxstore uxsel osxsel uxnet uxmisc uxproxy time
 MACMISC  = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy

diff --git a/windows/wincfg.c b/windows/wincfg.c
index 29201f4..6a970a7 100644 (file)
--- a/windows/wincfg.c
+++ b/windows/wincfg.c
@@ -333,4 +333,42 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
                  HELPCTX(behaviour_altenter),
                  dlg_stdcheckbox_handler,
                  I(offsetof(Config,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 == offsetof(Config, proxy_type)) {
+               assert(c->generic.handler == dlg_stdradiobutton_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);
+               break;
+           }
+       }
+
+       for (i = 0; i < s->ncontrols; i++) {
+           c = s->ctrls[i];
+           if (c->generic.type == CTRL_EDITBOX &&
+               c->generic.context.i ==
+               offsetof(Config, proxy_telnet_command)) {
+               assert(c->generic.handler == dlg_stdeditbox_handler);
+               sfree(c->generic.label);
+               c->generic.label = dupstr("Telnet command, or local"
+                                         " proxy command");
+               break;
+           }
+       }
+    }
 }

diff --git a/windows/winproxy.c b/windows/winproxy.c
new file mode 100644 (file)
index 0000000..329cb89
--- /dev/null
+++ b/windows/winproxy.c
@@ -0,0 +1,213 @@
+/*\r
+ * winproxy.c: Windows implementation of platform_new_connection(),\r
+ * supporting an OpenSSH-like proxy command via the winhandl.c\r
+ * mechanism.\r
+ */\r
+\r
+#include <stdio.h>\r
+#include <assert.h>\r
+\r
+#define DEFINE_PLUG_METHOD_MACROS\r
+#include "tree234.h"\r
+#include "putty.h"\r
+#include "network.h"\r
+#include "proxy.h"\r
+\r
+typedef struct Socket_localproxy_tag *Local_Proxy_Socket;\r
+\r
+struct Socket_localproxy_tag {\r
+    const struct socket_function_table *fn;\r
+    /* the above variable absolutely *must* be the first in this structure */\r
+\r
+    HANDLE to_cmd_H, from_cmd_H;\r
+    struct handle *to_cmd_h, *from_cmd_h;\r
+\r
+    char *error;\r
+\r
+    Plug plug;\r
+\r
+    void *privptr;\r
+};\r
+\r
+int localproxy_gotdata(struct handle *h, void *data, int len)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) handle_get_privdata(h);\r
+\r
+    if (len < 0) {\r
+       return plug_closing(ps->plug, "Read error from local proxy command",\r
+                           0, 0);\r
+    } else if (len == 0) {\r
+       return plug_closing(ps->plug, NULL, 0, 0);\r
+    } else {\r
+       return plug_receive(ps->plug, 1, data, len);\r
+    }\r
+}\r
+\r
+void localproxy_sentdata(struct handle *h, int new_backlog)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) handle_get_privdata(h);\r
+    \r
+    plug_sent(ps->plug, new_backlog);\r
+}\r
+\r
+static Plug sk_localproxy_plug (Socket s, Plug p)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+    Plug ret = ps->plug;\r
+    if (p)\r
+       ps->plug = p;\r
+    return ret;\r
+}\r
+\r
+static void sk_localproxy_close (Socket s)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+\r
+    handle_free(ps->to_cmd_h);\r
+    handle_free(ps->from_cmd_h);\r
+    CloseHandle(ps->to_cmd_H);\r
+    CloseHandle(ps->from_cmd_H);\r
+\r
+    sfree(ps);\r
+}\r
+\r
+static int sk_localproxy_write (Socket s, const char *data, int len)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+\r
+    return handle_write(ps->to_cmd_h, data, len);\r
+}\r
+\r
+static int sk_localproxy_write_oob(Socket s, const char *data, int len)\r
+{\r
+    /*\r
+     * oob data is treated as inband; nasty, but nothing really\r
+     * better we can do\r
+     */\r
+    return sk_localproxy_write(s, data, len);\r
+}\r
+\r
+static void sk_localproxy_flush(Socket s)\r
+{\r
+    /* Local_Proxy_Socket ps = (Local_Proxy_Socket) s; */\r
+    /* do nothing */\r
+}\r
+\r
+static void sk_localproxy_set_private_ptr(Socket s, void *ptr)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+    ps->privptr = ptr;\r
+}\r
+\r
+static void *sk_localproxy_get_private_ptr(Socket s)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+    return ps->privptr;\r
+}\r
+\r
+static void sk_localproxy_set_frozen(Socket s, int is_frozen)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+\r
+    /*\r
+     * FIXME\r
+     */\r
+}\r
+\r
+static const char *sk_localproxy_socket_error(Socket s)\r
+{\r
+    Local_Proxy_Socket ps = (Local_Proxy_Socket) s;\r
+    return ps->error;\r
+}\r
+\r
+Socket platform_new_connection(SockAddr addr, char *hostname,\r
+                              int port, int privport,\r
+                              int oobinline, int nodelay, int keepalive,\r
+                              Plug plug, const Config *cfg)\r
+{\r
+    char *cmd;\r
+\r
+    static const struct socket_function_table socket_fn_table = {\r
+       sk_localproxy_plug,\r
+       sk_localproxy_close,\r
+       sk_localproxy_write,\r
+       sk_localproxy_write_oob,\r
+       sk_localproxy_flush,\r
+       sk_localproxy_set_private_ptr,\r
+       sk_localproxy_get_private_ptr,\r
+       sk_localproxy_set_frozen,\r
+       sk_localproxy_socket_error\r
+    };\r
+\r
+    Local_Proxy_Socket ret;\r
+    HANDLE us_to_cmd, us_from_cmd, cmd_to_us, cmd_from_us;\r
+    SECURITY_ATTRIBUTES sa;\r
+    STARTUPINFO si;\r
+    PROCESS_INFORMATION pi;\r
+\r
+    if (cfg->proxy_type != PROXY_CMD)\r
+       return NULL;\r
+\r
+    cmd = format_telnet_command(addr, port, cfg);\r
+\r
+    {\r
+       char *msg = dupprintf("Starting local proxy command: %s", cmd);\r
+       /* We're allowed to pass NULL here, because we're part of the Windows\r
+        * front end so we know logevent doesn't expect any data. */\r
+       logevent(NULL, msg);\r
+       sfree(msg);\r
+    }\r
+\r
+    ret = snew(struct Socket_localproxy_tag);\r
+    ret->fn = &socket_fn_table;\r
+    ret->plug = plug;\r
+    ret->error = NULL;\r
+\r
+    /*\r
+     * Create the pipes to the proxy command, and spawn the proxy\r
+     * command process.\r
+     */\r
+    sa.nLength = sizeof(sa);\r
+    sa.lpSecurityDescriptor = NULL;    /* default */\r
+    sa.bInheritHandle = TRUE;\r
+    if (!CreatePipe(&us_from_cmd, &cmd_to_us, &sa, 0)) {\r
+       ret->error = dupprintf("Unable to create pipes for proxy command");\r
+       return (Socket)ret;\r
+    }\r
+\r
+    if (!CreatePipe(&cmd_from_us, &us_to_cmd, &sa, 0)) {\r
+       CloseHandle(us_from_cmd);\r
+       CloseHandle(cmd_to_us);\r
+       ret->error = dupprintf("Unable to create pipes for proxy command");\r
+       return (Socket)ret;\r
+    }\r
+\r
+    si.cb = sizeof(si);\r
+    si.lpReserved = NULL;\r
+    si.lpDesktop = NULL;\r
+    si.lpTitle = NULL;\r
+    si.dwFlags = STARTF_USESTDHANDLES;\r
+    si.cbReserved2 = 0;\r
+    si.lpReserved2 = NULL;\r
+    si.hStdInput = cmd_from_us;\r
+    si.hStdOutput = cmd_to_us;\r
+    si.hStdError = NULL;\r
+    CreateProcess(NULL, cmd, NULL, NULL, TRUE,\r
+                 CREATE_NO_WINDOW | NORMAL_PRIORITY_CLASS,\r
+                 NULL, NULL, &si, &pi);\r
+\r
+    CloseHandle(cmd_from_us);\r
+    CloseHandle(cmd_to_us);\r
+\r
+    ret->to_cmd_H = us_to_cmd;\r
+    ret->from_cmd_H = us_from_cmd;\r
+\r
+    ret->from_cmd_h = handle_input_new(ret->from_cmd_H, localproxy_gotdata, ret);\r
+    ret->to_cmd_h = handle_output_new(ret->to_cmd_H,\r
+                                       localproxy_sentdata, ret);\r
+\r
+    /* We are responsible for this and don't need it any more */\r
+    sk_addr_free(addr);\r
+\r
+    return (Socket) ret;\r
+}\r