dropbear: cli-runopts.c annotate

annotate cli-runopts.c @ 551:c3f2ec71e3d4 agent-client

New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList

author	Matt Johnston <matt@ucc.asn.au>
date	Mon, 06 Jul 2009 12:59:13 +0000
parents	568638be7203
children	005530560594

rev	line source
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "runopts.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "signkey.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "buffer.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "dbutil.h"
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "algo.h"
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	31 #include "tcpfwd.h"
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	32 #include "list.h"
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 cli_runopts cli_opts; /* GLOBAL */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	36 static void printhelp();
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	37 static void parse_hostname(const char* orighostarg);
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	38 static void parse_multihop_hostname(const char* orighostarg, const char* argv0);
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	39 static void fill_own_user();
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	40 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	41 static void loadidentityfile(const char* filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	42 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	43 #ifdef ENABLE_CLI_ANYTCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	44 static void addforward(const char* str, m_list *fwdlist);
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	45 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	46 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	47 static void add_netcat(const char *str);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	48 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	50 static void printhelp() {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 fprintf(stderr, "Dropbear client v%s\n"
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	53 #ifdef ENABLE_CLI_MULTIHOP
4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	54 "Usage: %s [options] [user@]host[/port][,[user@]host/port],...] [command]\n"
4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	55 #else
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	56 "Usage: %s [options] [user@]host[/port] [command]\n"
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	57 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 "Options are:\n"
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	59 "-p <remoteport>\n"
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	60 "-l <username>\n"
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	61 "-t Allocate a pty\n"
6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	62 "-T Don't allocate a pty\n"
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	63 "-N Don't run a remote command\n"
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	64 "-f Run in background after auth\n"
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	65 "-y Always accept remote host key if unknown\n"
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	66 "-s Request a subsystem (use for sftp)\n"
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	67 #ifdef ENABLE_CLI_PUBKEY_AUTH
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	68 "-i <identityfile> (multiple allowed)\n"
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	69 #endif
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	70 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	71 "-A Enable agent auth forwarding\n"
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	72 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	73 #ifdef ENABLE_CLI_LOCALTCPFWD
181 1916df7df911 * Add references in the manpages to the dbclient manpage Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	74 "-L <listenport:remotehost:remoteport> Local port forwarding\n"
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	75 "-g Allow remote hosts to connect to forwarded ports\n"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	76 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	77 #ifdef ENABLE_CLI_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	78 "-R <listenport:remotehost:remoteport> Remote port forwarding\n"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	79 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	80 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	81 "-K <keepalive> (0 is never, default %d)\n"
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	82 "-I <idle_timeout> (0 is never, default %d)\n"
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	83 #ifdef ENABLE_CLI_NETCAT
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	84 "-B <endhost:endport> Netcat-alike forwarding\n"
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	85 #endif
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	86 #ifdef ENABLE_CLI_PROXYCMD
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	87 "-J <proxy_program> Use program pipe rather than TCP connection\n"
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	88 #endif
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	89 #ifdef DEBUG_TRACE
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	90 "-v verbose (compiled with DEBUG_TRACE)\n"
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	91 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	92 ,DROPBEAR_VERSION, cli_opts.progname,
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	93 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT);
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	94
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 void cli_getopts(int argc, char ** argv) {
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	98 unsigned int i, j;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 char ** next = 0;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	100 unsigned int cmdlen;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	101 #ifdef ENABLE_CLI_PUBKEY_AUTH
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	102 int nextiskey = 0; /* A flag if the next argument is a keyfile */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	103 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	104 #ifdef ENABLE_CLI_LOCALTCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	105 int nextislocal = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	106 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	107 #ifdef ENABLE_CLI_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	108 int nextisremote = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	109 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	110 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	111 int nextisnetcat = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	112 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	113 char* dummy = NULL; /* Not used for anything real */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	115 char* recv_window_arg = NULL;
f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	116 char* keepalive_arg = NULL;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	117 char* idle_timeout_arg = NULL;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	118 char *host_arg = NULL;
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	119
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 /* see printhelp() for options */
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	121 cli_opts.progname = argv[0];
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 cli_opts.remotehost = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 cli_opts.remoteport = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 cli_opts.username = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 cli_opts.cmd = NULL;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	126 cli_opts.no_cmd = 0;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	127 cli_opts.backgrounded = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	128 cli_opts.wantpty = 9; /* 9 means "it hasn't been touched", gets set later */
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	129 cli_opts.always_accept_key = 0;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	130 cli_opts.is_subsystem = 0;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	131 #ifdef ENABLE_CLI_PUBKEY_AUTH
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	132 cli_opts.privkeys = list_new();
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	133 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	134 #ifdef ENABLE_CLI_LOCALTCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	135 cli_opts.localfwds = list_new();
446 2cd2edfa11ee Just use /dev/urandom since that's what everyone ends up using anyway. Matt Johnston <matt@ucc.asn.au> parents: 442 diff changeset	136 opts.listen_fwd_all = 0;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	137 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	138 #ifdef ENABLE_CLI_REMOTETCPFWD
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	139 cli_opts.remotefwds = list_new();
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	140 #endif
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	141 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	142 cli_opts.agent_fwd = 0;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	143 cli_opts.agent_keys_loaded = 0;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	144 #endif
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	145 #ifdef ENABLE_CLI_PROXYCMD
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	146 cli_opts.proxycmd = NULL;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	147 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 /* not yet
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 opts.ipv4 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 opts.ipv6 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 */
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	152 opts.recv_window = DEFAULT_RECV_WINDOW;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	154 fill_own_user();
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	155
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	156 /* Iterate all the arguments */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	157 for (i = 1; i < (unsigned int)argc; i++) {
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	158 #ifdef ENABLE_CLI_PUBKEY_AUTH
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	159 if (nextiskey) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	160 /* Load a hostkey since the previous argument was "-i" */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	161 loadidentityfile(argv[i]);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	162 nextiskey = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	163 continue;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	165 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	166 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	167 if (nextisremote) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	168 TRACE(("nextisremote true"))
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	169 addforward(argv[i], cli_opts.remotefwds);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	170 nextisremote = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	171 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	172 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	173 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	174 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	175 if (nextislocal) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	176 TRACE(("nextislocal true"))
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	177 addforward(argv[i], cli_opts.localfwds);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	178 nextislocal = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	179 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	180 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	181 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	182 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	183 if (nextisnetcat) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	184 TRACE(("nextisnetcat true"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	185 add_netcat(argv[i]);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	186 nextisnetcat = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	187 continue;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	188 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	189 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 if (next) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	191 /* The previous flag set a value to assign */
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 *next = argv[i];
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 if (*next == NULL) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 dropbear_exit("Invalid null argument");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	196 next = NULL;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 continue;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 if (argv[i][0] == '-') {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	201 /* A flag waves */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	202
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 switch (argv[i][1]) {
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	204 case 'y': /* always accept the remote hostkey */
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	205 cli_opts.always_accept_key = 1;
ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	206 break;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	207 case 'p': /* remoteport */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	208 next = &cli_opts.remoteport;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 break;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	210 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	211 case 'i': /* an identityfile */
134 6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	212 /* Keep scp happy when it changes "-i file" to "-ifile" */
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	213 if (strlen(argv[i]) > 2) {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	214 loadidentityfile(&argv[i][2]);
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	215 } else {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	216 nextiskey = 1;
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	217 }
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218 break;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	220 case 't': /* we want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	221 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	222 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	223 case 'T': /* don't want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	224 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	225 break;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	226 case 'N':
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	227 cli_opts.no_cmd = 1;
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	228 break;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	229 case 'f':
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	230 cli_opts.backgrounded = 1;
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	231 break;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	232 case 's':
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	233 cli_opts.is_subsystem = 1;
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	234 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	235 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	236 case 'L':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	237 nextislocal = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	238 break;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	239 case 'g':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	240 opts.listen_fwd_all = 1;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	241 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	242 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	243 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	244 case 'R':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	245 nextisremote = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	246 break;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	247 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	248 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	249 case 'B':
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	250 nextisnetcat = 1;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	251 break;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	252 #endif
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	253 #ifdef ENABLE_CLI_PROXYCMD
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	254 case 'J':
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	255 next = &cli_opts.proxycmd;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	256 break;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	257 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	258 case 'l':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	259 next = &cli_opts.username;
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	260 break;
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	261 case 'h':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	262 printhelp();
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	263 exit(EXIT_SUCCESS);
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	264 break;
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	265 case 'u':
446 2cd2edfa11ee Just use /dev/urandom since that's what everyone ends up using anyway. Matt Johnston <matt@ucc.asn.au> parents: 442 diff changeset	266 /* backwards compatibility with old urandom option */
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	267 break;
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	268 case 'W':
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	269 next = &recv_window_arg;
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	270 break;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	271 case 'K':
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	272 next = &keepalive_arg;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	273 break;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	274 case 'I':
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	275 next = &idle_timeout_arg;
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	276 break;
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	277 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	278 case 'A':
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	279 cli_opts.agent_fwd = 1;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	280 break;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	281 #endif
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	282 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	283 case 'v':
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	284 debug_trace = 1;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	285 break;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	286 #endif
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	287 case 'F':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	288 case 'e':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	289 case 'c':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	290 case 'm':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	291 case 'D':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	292 #ifndef ENABLE_CLI_REMOTETCPFWD
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	293 case 'R':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	294 #endif
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	295 #ifndef ENABLE_CLI_LOCALTCPFWD
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	296 case 'L':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	297 #endif
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	298 case 'o':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	299 case 'b':
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	300 next = &dummy;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 default:
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	302 fprintf(stderr,
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	303 "WARNING: Ignoring unknown argument '%s'\n", argv[i]);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 break;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	305 } /* Switch */
105 68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	306
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	307 /* Now we handle args where they might be "-luser" (no spaces)*/
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	308 if (next && strlen(argv[i]) > 2) {
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	309 *next = &argv[i][2];
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	310 next = NULL;
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	311 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	312
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	313 continue; /* next argument */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	314
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	315 } else {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	316 TRACE(("non-flag arg: '%s'", argv[i]))
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	317
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	318 /* Either the hostname or commands */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	319
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	320 if (host_arg == NULL) {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	321 host_arg = argv[i];
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	322 } else {
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	323
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	324 /* this is part of the commands to send - after this we
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	325 * don't parse any more options, and flags are sent as the
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	326 * command */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	327 cmdlen = 0;
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	328 for (j = i; j < (unsigned int)argc; j++) {
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	329 cmdlen += strlen(argv[j]) + 1; /* +1 for spaces */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	330 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	331 /* Allocate the space */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	332 cli_opts.cmd = (char*)m_malloc(cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	333 cli_opts.cmd[0] = '\0';
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	334
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	335 /* Append all the bits */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	336 for (j = i; j < (unsigned int)argc; j++) {
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	337 strlcat(cli_opts.cmd, argv[j], cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	338 strlcat(cli_opts.cmd, " ", cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	339 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	340 /* It'll be null-terminated here */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	341
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	342 /* We've eaten all the options and flags */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	343 break;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	347
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	348 /* And now a few sanity checks and setup */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	349
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	350 if (host_arg == NULL) {
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	351 printhelp();
38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	352 exit(EXIT_FAILURE);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	353 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	354
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	355 if (cli_opts.remoteport == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	356 cli_opts.remoteport = "22";
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	357 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	358
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	359 /* If not explicitly specified with -t or -T, we don't want a pty if
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	360 * there's a command, but we do otherwise */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	361 if (cli_opts.wantpty == 9) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	362 if (cli_opts.cmd == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	363 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	364 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	365 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	366 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	367 }
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	368
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	369 if (cli_opts.backgrounded && cli_opts.cmd == NULL
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	370 && cli_opts.no_cmd == 0) {
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	371 dropbear_exit("command required for -f");
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	372 }
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	373
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	374 if (recv_window_arg) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	375 opts.recv_window = atol(recv_window_arg);
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	376 if (opts.recv_window == 0 \|\| opts.recv_window > MAX_RECV_WINDOW) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	377 dropbear_exit("Bad recv window '%s'", recv_window_arg);
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	378 }
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	379 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	380 if (keepalive_arg) {
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	381 if (m_str_to_uint(keepalive_arg, &opts.keepalive_secs) == DROPBEAR_FAILURE) {
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	382 dropbear_exit("Bad keepalive '%s'", keepalive_arg);
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	383 }
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	384 }
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	385
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	386 if (idle_timeout_arg) {
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	387 if (m_str_to_uint(idle_timeout_arg, &opts.idle_timeout_secs) == DROPBEAR_FAILURE) {
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	388 dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg);
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	389 }
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	390 }
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	391
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	392 #ifdef ENABLE_CLI_NETCAT
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	393 if (cli_opts.cmd && cli_opts.netcat_host) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	394 dropbear_log(LOG_INFO, "Ignoring command '%s' in netcat mode", cli_opts.cmd);
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	395 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	396 #endif
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	397
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	398 /* The hostname gets set up last, since
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	399 * in multi-hop mode it will require knowledge
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	400 * of other flags such as -i */
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	401 #ifdef ENABLE_CLI_MULTIHOP
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	402 parse_multihop_hostname(host_arg, argv[0]);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	403 #else
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	404 parse_hostname(host_arg);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	405 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	407
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	408 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	409 static void loadidentityfile(const char* filename) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	410 sign_key *key;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	411 int keytype;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	412
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	413 key = new_sign_key();
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	414 keytype = DROPBEAR_SIGNKEY_ANY;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	415 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	416 fprintf(stderr, "Failed loading keyfile '%s'\n", filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	417 sign_key_free(key);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	418 } else {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	419 key->type = keytype;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	420 key->source = SIGNKEY_SOURCE_RAW_FILE;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	421 key->filename = m_strdup(filename);
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	422 list_append(cli_opts.privkeys, key);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	423 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	424 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	425 #endif
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	426
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	427 #ifdef ENABLE_CLI_MULTIHOP
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	428
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	429 static char*
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	430 multihop_passthrough_args() {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	431 char *ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	432 int total;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	433 unsigned int len = 0;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	434 m_list_elem *iter;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	435 /* Fill out -i and -W options that make sense for all
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	436 * the intermediate processes */
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	437 for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	438 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	439 sign_key * key = (sign_key*)iter->item;
c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	440 len += 3 + strlen(key->filename);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	441 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	442 len += 20; // space for -W <size>, terminator.
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	443 ret = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	444 total = 0;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	445
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	446 if (opts.recv_window != DEFAULT_RECV_WINDOW)
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	447 {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	448 int written = snprintf(ret+total, len-total, "-W %d", opts.recv_window);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	449 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	450 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	451
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	452 for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	453 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	454 sign_key * key = (sign_key*)iter->item;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	455 const size_t size = len - total;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	456 int written = snprintf(ret+total, size, "-i %s", key->filename);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	457 dropbear_assert(written < size);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	458 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	459 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	460
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	461 return ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	462 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	463
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	464 /* Sets up 'onion-forwarding' connections. This will spawn
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	465 * a separate dbclient process for each hop.
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	466 * As an example, if the cmdline is
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	467 * dbclient wrt,madako,canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	468 * then we want to run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	469 * dbclient -J "dbclient -B canyons:22 wrt,madako" canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	470 * and then the inner dbclient will recursively run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	471 * dbclient -J "dbclient -B madako:22 wrt" madako
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	472 * etc for as many hosts as we want.
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	473 *
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	474 * Ports for hosts can be specified as host/port.
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	475 */
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	476 static void parse_multihop_hostname(const char* orighostarg, const char* argv0) {
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	477 char *userhostarg = NULL;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	478 char *hostbuf = NULL;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	479 char *last_hop = NULL;;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	480 char *remainder = NULL;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	481
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	482 /* both scp and rsync parse a user@host argument
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	483 * and turn it into "-l user host". This breaks
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	484 * for our multihop syntax, so we suture it back together.
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	485 * This will break usernames that have both '@' and ',' in them,
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	486 * though that should be fairly uncommon. */
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	487 if (cli_opts.username
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	488 && strchr(cli_opts.username, ',')
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	489 && strchr(cli_opts.username, '@')) {
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	490 unsigned int len = strlen(orighostarg) + strlen(cli_opts.username) + 2;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	491 hostbuf = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	492 snprintf(hostbuf, len, "%s@%s", cli_opts.username, orighostarg);
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	493 } else {
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	494 hostbuf = m_strdup(orighostarg);
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	495 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	496 userhostarg = hostbuf;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	497
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	498 last_hop = strrchr(userhostarg, ',');
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	499 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	500 if (last_hop == userhostarg) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	501 dropbear_exit("Bad multi-hop hostnames");
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	502 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	503 *last_hop = '\0';
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	504 last_hop++;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	505 remainder = userhostarg;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	506 userhostarg = last_hop;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	507 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	508
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	509 parse_hostname(userhostarg);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	510
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	511 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	512 /* Set up the proxycmd */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	513 unsigned int cmd_len = 0;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	514 char *passthrough_args = multihop_passthrough_args();
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	515 if (cli_opts.proxycmd) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	516 dropbear_exit("-J can't be used with multihop mode");
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	517 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	518 if (cli_opts.remoteport == NULL) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	519 cli_opts.remoteport = "22";
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	520 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	521 cmd_len = strlen(argv0) + strlen(remainder)
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	522 + strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	523 + strlen(passthrough_args)
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	524 + 30;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	525 cli_opts.proxycmd = m_malloc(cmd_len);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	526 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s %s",
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	527 argv0, cli_opts.remotehost, cli_opts.remoteport,
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	528 passthrough_args, remainder);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	529 m_free(passthrough_args);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	530 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	531 m_free(hostbuf);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	532 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	533 #endif /* !ENABLE_CLI_MULTIHOP */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	534
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	535 /* Parses a [user@]hostname[/port] argument. */
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	536 static void parse_hostname(const char* orighostarg) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	537 char *userhostarg = NULL;
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	538 char *port = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	539
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	540 userhostarg = m_strdup(orighostarg);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	541
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	542 cli_opts.remotehost = strchr(userhostarg, '@');
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	543 if (cli_opts.remotehost == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	544 /* no username portion, the cli-auth.c code can figure the
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	545 * local user's name */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	546 cli_opts.remotehost = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	547 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	548 cli_opts.remotehost[0] = '\0'; /* Split the user/host */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	549 cli_opts.remotehost++;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	550 cli_opts.username = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	551 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	552
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	553 if (cli_opts.username == NULL) {
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	554 cli_opts.username = m_strdup(cli_opts.own_user);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	555 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	556
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	557 port = strchr(cli_opts.remotehost, '/');
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	558 if (port) {
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	559 *port = '\0';
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	560 cli_opts.remoteport = port+1;
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	561 }
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	562
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	563 if (cli_opts.remotehost[0] == '\0') {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	564 dropbear_exit("Bad hostname");
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	565 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	566 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	567
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	568 #ifdef ENABLE_CLI_NETCAT
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	569 static void add_netcat(const char* origstr) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	570 char *portstr = NULL;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	571
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	572 char * str = m_strdup(origstr);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	573
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	574 portstr = strchr(str, ':');
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	575 if (portstr == NULL) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	576 TRACE(("No netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	577 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	578 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	579 *portstr = '\0';
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	580 portstr++;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	581
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	582 if (strchr(portstr, ':')) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	583 TRACE(("Multiple netcat colons"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	584 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	585 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	586
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	587 if (m_str_to_uint(portstr, &cli_opts.netcat_port) == DROPBEAR_FAILURE) {
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	588 TRACE(("bad netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	589 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	590 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	591
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	592 if (cli_opts.netcat_port > 65535) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	593 TRACE(("too large netcat port"))
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	594 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	595 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	596
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	597 cli_opts.netcat_host = str;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	598 return;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	599
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	600 fail:
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	601 dropbear_exit("Bad netcat endpoint '%s'", origstr);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	602 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	603 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	604
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	605 static void fill_own_user() {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	606 uid_t uid;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	607 struct passwd *pw = NULL;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	608
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	609 uid = getuid();
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	610
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	611 pw = getpwuid(uid);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	612 if (pw == NULL \|\| pw->pw_name == NULL) {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	613 dropbear_exit("Unknown own user");
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	614 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	615
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	616 cli_opts.own_user = m_strdup(pw->pw_name);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	617 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	618
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	619 #ifdef ENABLE_CLI_ANYTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	620 /* Turn a "listenport:remoteaddr:remoteport" string into into a forwarding
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	621 * set, and add it to the forwarding list */
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	622 static void addforward(const char* origstr, m_list *fwdlist) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	623
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	624 char * listenport = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	625 char * connectport = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	626 char * connectaddr = NULL;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	627 struct TCPFwdEntry* newfwd = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	628 char * str = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	629
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	630 TRACE(("enter addforward"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	631
411 253958302381 Revert bogus fix, make a note that the var is meant to 'leak' Matt Johnston <matt@ucc.asn.au> parents: 407 diff changeset	632 /* We need to split the original argument up. This var
253958302381 Revert bogus fix, make a note that the var is meant to 'leak' Matt Johnston <matt@ucc.asn.au> parents: 407 diff changeset	633 is never free()d. */
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	634 str = m_strdup(origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	635
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	636 listenport = str;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	637
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	638 connectaddr = strchr(str, ':');
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	639 if (connectaddr == NULL) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	640 TRACE(("connectaddr == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	641 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	642 }
407 ea0929224294 Fix another leak found by Klocwork Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	643 *connectaddr = '\0';
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	644 connectaddr++;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	645
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	646 connectport = strchr(connectaddr, ':');
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	647 if (connectport == NULL) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	648 TRACE(("connectport == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	649 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	650 }
407 ea0929224294 Fix another leak found by Klocwork Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	651 *connectport = '\0';
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	652 connectport++;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	653
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	654 newfwd = m_malloc(sizeof(struct TCPFwdEntry));
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	655
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	656 /* Now we check the ports - note that the port ints are unsigned,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	657 * the check later only checks for >= MAX_PORT */
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	658 if (m_str_to_uint(listenport, &newfwd->listenport) == DROPBEAR_FAILURE) {
b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	659 TRACE(("bad listenport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	660 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	661 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	662
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	663 if (m_str_to_uint(connectport, &newfwd->connectport) == DROPBEAR_FAILURE) {
b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	664 TRACE(("bad connectport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	665 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	666 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	667
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	668 newfwd->connectaddr = connectaddr;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	669
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	670 if (newfwd->listenport > 65535) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	671 TRACE(("listenport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	672 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	673 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	674
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	675 if (newfwd->connectport > 65535) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	676 TRACE(("connectport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	677 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	678 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	679
505 805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 497 diff changeset	680 newfwd->have_reply = 0;
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	681 list_append(fwdlist, newfwd);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	682
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 134 diff changeset	683 TRACE(("leave addforward: done"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	684 return;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	685
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	686 fail:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	687 dropbear_exit("Bad TCP forward '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	688
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	689 badport:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	690 dropbear_exit("Bad TCP port in '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	691 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	692 #endif

Mercurial > dropbear

annotate cli-runopts.c @ 551:c3f2ec71e3d4 agent-client