dropbear: cli-runopts.c annotate

annotate cli-runopts.c @ 496:9f583f4d59a6

propagate from branch 'au.asn.ucc.matt.dropbear.pubkey-options' (head 537a6ebebb46424b967ffe787f0f8560e5f447e8) to branch 'au.asn.ucc.matt.dropbear' (head 10b2f286b9886364db39dfbb4f8f46e49e345d87)

author	Matt Johnston <matt@ucc.asn.au>
date	Tue, 23 Sep 2008 13:16:22 +0000
parents	66eac4631d88
children	ae600f1eef81

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"
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 cli_runopts cli_opts; /* GLOBAL */
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	35 static void printhelp();
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	36 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	37 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	38 static void fill_own_user();
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	39 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	40 static void loadidentityfile(const char* filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	41 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	42 #ifdef ENABLE_CLI_ANYTCPFWD
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	43 static void addforward(const char* str, struct TCPFwdList** fwdlist);
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	44 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	45 #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	46 static void add_netcat(const char *str);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	47 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	49 static void printhelp() {
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 fprintf(stderr, "Dropbear client v%s\n"
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	52 "Usage: %s [options] [user@]host[/port] [command]\n"
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 "Options are:\n"
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	54 "-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	55 "-l <username>\n"
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	56 "-t Allocate a pty\n"
6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	57 "-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	58 "-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	59 "-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	60 "-y Always accept remote host key if unknown\n"
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	61 #ifdef ENABLE_CLI_PUBKEY_AUTH
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	62 "-i <identityfile> (multiple allowed)\n"
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	63 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	64 #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	65 "-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	66 "-g Allow remote hosts to connect to forwarded ports\n"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	67 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	68 #ifdef ENABLE_CLI_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	69 "-R <listenport:remotehost:remoteport> Remote port forwarding\n"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	70 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	71 "-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	72 "-K <keepalive> (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	73 #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	74 "-B <endhost:endport> Netcat-alike bouncing\n"
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	75 #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	76 #ifdef ENABLE_CLI_PROXYCMD
484 effb4a25b1ae Don't capture stderr from spawned processes in proxycommand mode Matt Johnston <matt@ucc.asn.au> parents: 483 diff changeset	77 "-J <proxy_program> Use program 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	78 #endif
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	79 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	80 "-v verbose\n"
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	81 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	82 ,DROPBEAR_VERSION, cli_opts.progname,
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	83 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE);
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	84
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 void cli_getopts(int argc, char ** argv) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	89 unsigned int i, j;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 char ** next = 0;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	91 unsigned int cmdlen;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	92 #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	93 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	94 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	95 #ifdef ENABLE_CLI_LOCALTCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	96 int nextislocal = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	97 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	98 #ifdef ENABLE_CLI_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	99 int nextisremote = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	100 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	101 #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	102 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	103 #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	104 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	105
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	106 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	107 char* keepalive_arg = NULL;
f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	108
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 /* 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	110 cli_opts.progname = argv[0];
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 cli_opts.remotehost = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 cli_opts.remoteport = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 cli_opts.username = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 cli_opts.cmd = NULL;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	115 cli_opts.no_cmd = 0;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	116 cli_opts.backgrounded = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	117 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	118 cli_opts.always_accept_key = 0;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	119 #ifdef ENABLE_CLI_PUBKEY_AUTH
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 181 diff changeset	120 cli_opts.privkeys = NULL;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	121 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	122 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	123 cli_opts.localfwds = NULL;
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	124 opts.listen_fwd_all = 0;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	125 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	126 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	127 cli_opts.remotefwds = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	128 #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	129 #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	130 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	131 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 /* not yet
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 opts.ipv4 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 opts.ipv6 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 */
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	136 opts.recv_window = DEFAULT_RECV_WINDOW;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	138 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	139
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	140 /* Iterate all the arguments */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	141 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	142 #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	143 if (nextiskey) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	144 /* Load a hostkey since the previous argument was "-i" */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	145 loadidentityfile(argv[i]);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	146 nextiskey = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	147 continue;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	149 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	150 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	151 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	152 TRACE(("nextisremote true"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	153 addforward(argv[i], &cli_opts.remotefwds);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	154 nextisremote = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	155 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	156 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	157 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	158 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	159 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	160 TRACE(("nextislocal true"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	161 addforward(argv[i], &cli_opts.localfwds);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	162 nextislocal = 0;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	163 continue;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	164 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	165 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	166 #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	167 if (nextisnetcat) {
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	168 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	169 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	170 nextisnetcat = 0;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	171 continue;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	172 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	173 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 if (next) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	175 /* 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	176 *next = argv[i];
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 if (*next == NULL) {
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 dropbear_exit("Invalid null argument");
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	180 next = NULL;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 continue;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 if (argv[i][0] == '-') {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	185 /* A flag waves */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	186
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 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	188 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	189 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	190 break;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	191 case 'p': /* remoteport */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	192 next = &cli_opts.remoteport;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 break;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	194 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	195 case 'i': /* an identityfile */
134 6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	196 /* 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	197 if (strlen(argv[i]) > 2) {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	198 loadidentityfile(&argv[i][2]);
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	199 } else {
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	200 nextiskey = 1;
6b306ad5f5b5 -i works with scp now. Matt Johnston <matt@ucc.asn.au> parents: 105 diff changeset	201 }
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 break;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	204 case 't': /* we want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	205 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	206 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	207 case 'T': /* don't want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	208 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	209 break;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	210 case 'N':
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	211 cli_opts.no_cmd = 1;
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	212 break;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	213 case 'f':
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	214 cli_opts.backgrounded = 1;
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	215 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	216 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	217 case 'L':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	218 nextislocal = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	219 break;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	220 case 'g':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	221 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	222 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	223 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	224 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	225 case 'R':
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	226 nextisremote = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	227 break;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	228 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	229 #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	230 case 'B':
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	231 nextisnetcat = 1;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	232 break;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	233 #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	234 #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	235 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	236 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	237 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	238 #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	239 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	240 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	241 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	242 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	243 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	244 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	245 break;
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	246 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	247 /* 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	248 break;
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	249 case 'W':
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	250 next = &recv_window_arg;
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	251 break;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	252 case 'K':
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	253 next = &keepalive_arg;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	254 break;
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	255 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	256 case 'v':
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	257 debug_trace = 1;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	258 break;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	259 #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	260 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	261 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	262 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	263 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	264 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	265 #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	266 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	267 #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	268 #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	269 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	270 #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	271 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	272 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	273 next = &dummy;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 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	275 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	276 "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	277 break;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	278 } /* Switch */
105 68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	279
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	280 /* 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	281 if (next && strlen(argv[i]) > 2) {
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	282 *next = &argv[i][2];
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	283 next = NULL;
68b84c20ca1e Fix for "-l" scp option Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	284 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	285
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	286 continue; /* next argument */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	287
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	288 } 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	289 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	290
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	291 /* Either the hostname or commands */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	292
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	293 if (cli_opts.remotehost == NULL) {
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	294 #ifdef ENABLE_CLI_MULTIHOP
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	295 parse_multihop_hostname(argv[i], argv[0]);
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	296 #else
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	297 parse_hostname(argv[i]);
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	298 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	299 } else {
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	300
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	301 /* 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	302 * 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	303 * command */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	304 cmdlen = 0;
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	305 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	306 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	307 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	308 /* Allocate the space */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	309 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	310 cli_opts.cmd[0] = '\0';
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	311
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	312 /* Append all the bits */
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	313 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	314 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	315 strlcat(cli_opts.cmd, " ", cmdlen);
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	316 }
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	317 /* 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	318
3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	319 /* 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	320 break;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	324
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	325 /* 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	326
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	327 if (cli_opts.remotehost == 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	328 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	329 exit(EXIT_FAILURE);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	330 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	331
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	332 if (cli_opts.remoteport == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	333 cli_opts.remoteport = "22";
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	334 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	335
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	336 /* 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	337 * there's a command, but we do otherwise */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	338 if (cli_opts.wantpty == 9) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	339 if (cli_opts.cmd == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	340 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	341 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	342 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	343 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	344 }
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	345
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	346 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	347 && cli_opts.no_cmd == 0) {
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	348 dropbear_exit("command required for -f");
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	349 }
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	350
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	351 if (recv_window_arg) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	352 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	353 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	354 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	355 }
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	356 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	357 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	358 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	359 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	360 }
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	361 }
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	362
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	363 #ifdef ENABLE_CLI_NETCAT
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	364 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	365 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	366 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	367 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	368
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	370
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	371 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	372 static void loadidentityfile(const char* filename) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	373
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 181 diff changeset	374 struct SignKeyList * nextkey;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	375 sign_key *key;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	376 int keytype;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	377
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	378 key = new_sign_key();
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	379 keytype = DROPBEAR_SIGNKEY_ANY;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	380 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	381
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	382 fprintf(stderr, "Failed loading keyfile '%s'\n", filename);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	383 sign_key_free(key);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	384
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	385 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	386
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 181 diff changeset	387 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList));
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	388 nextkey->key = key;
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 181 diff changeset	389 nextkey->next = cli_opts.privkeys;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	390 nextkey->type = keytype;
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 181 diff changeset	391 cli_opts.privkeys = nextkey;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	392 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	393 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	394 #endif
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	395
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	396 #ifdef ENABLE_CLI_MULTIHOP
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	397
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	398 /* 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	399 * 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	400 * 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	401 * dbclient wrt,madako,canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	402 * then we want to run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	403 * 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	404 * 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	405 * 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	406 * 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	407 *
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	408 * 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	409 */
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	410 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	411 char *userhostarg = NULL;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	412 char *last_hop = NULL;;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	413 char *remainder = NULL;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	414
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	415 /* 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	416 * 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	417 * 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	418 * 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	419 * 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	420 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	421 && 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	422 && 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	423 unsigned int len = strlen(orighostarg) + strlen(cli_opts.username) + 2;
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	424 userhostarg = m_malloc(len);
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	425 snprintf(userhostarg, len, "%s@%s", cli_opts.username, orighostarg);
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	426 } else {
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	427 userhostarg = m_strdup(orighostarg);
66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	428 }
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	429
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	430 last_hop = strrchr(userhostarg, ',');
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	431 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	432 if (last_hop == userhostarg) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	433 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	434 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	435 *last_hop = '\0';
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	436 last_hop++;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	437 remainder = userhostarg;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	438 userhostarg = last_hop;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	439 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	440
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	441 parse_hostname(userhostarg);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	442
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	443 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	444 /* Set up the proxycmd */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	445 unsigned int cmd_len = 0;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	446 if (cli_opts.proxycmd) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	447 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	448 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	449 if (cli_opts.remoteport == NULL) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	450 cli_opts.remoteport = "22";
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	451 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	452 cmd_len = strlen(remainder)
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	453 + strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	454 + strlen(argv0) + 30;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	455 cli_opts.proxycmd = m_malloc(cmd_len);
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	456 snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s",
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	457 argv0, cli_opts.remotehost, cli_opts.remoteport, remainder);
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	458 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	459 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	460 #endif /* !ENABLE_CLI_MULTIHOP */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	461
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	462 /* Parses a [user@]hostname[/port] argument. */
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	463 static void parse_hostname(const char* orighostarg) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	464 char *userhostarg = NULL;
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	465 char *port = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	466
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	467 userhostarg = m_strdup(orighostarg);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	468
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	469 cli_opts.remotehost = strchr(userhostarg, '@');
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	470 if (cli_opts.remotehost == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	471 /* 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	472 * local user's name */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	473 cli_opts.remotehost = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	474 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	475 cli_opts.remotehost[0] = '\0'; /* Split the user/host */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	476 cli_opts.remotehost++;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	477 cli_opts.username = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	478 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	479
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	480 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	481 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	482 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	483
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	484 port = strchr(cli_opts.remotehost, '/');
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	485 if (port) {
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	486 *port = '\0';
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	487 cli_opts.remoteport = port+1;
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	488 }
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	489
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	490 if (cli_opts.remotehost[0] == '\0') {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	491 dropbear_exit("Bad hostname");
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	492 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	493 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	494
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	495 #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	496 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	497 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	498
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	499 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	500
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	501 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	502 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	503 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	504 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	505 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	506 *portstr = '\0';
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	507 portstr++;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	508
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	509 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	510 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	511 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	512 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	513
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	514 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	515 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	516 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	517 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	518
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	519 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	520 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	521 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	522 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	523
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	524 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	525 return;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	526
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	527 fail:
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	528 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	529 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	530 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	531
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	532 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	533 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	534 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	535
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	536 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	537
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	538 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	539 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	540 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	541 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	542
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	543 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	544 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	545
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	546 #ifdef ENABLE_CLI_ANYTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	547 /* Turn a "listenport:remoteaddr:remoteport" string into into a forwarding
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	548 * set, and add it to the forwarding list */
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	549 static void addforward(const char* origstr, struct TCPFwdList** fwdlist) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	550
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	551 char * listenport = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	552 char * connectport = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	553 char * connectaddr = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	554 struct TCPFwdList* newfwd = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	555 char * str = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	556
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	557 TRACE(("enter addforward"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	558
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	559 /* 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	560 is never free()d. */
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	561 str = m_strdup(origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	562
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	563 listenport = str;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	564
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	565 connectaddr = strchr(str, ':');
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	566 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	567 TRACE(("connectaddr == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	568 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	569 }
407 ea0929224294 Fix another leak found by Klocwork Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	570 *connectaddr = '\0';
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	571 connectaddr++;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	572
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	573 connectport = strchr(connectaddr, ':');
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	574 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	575 TRACE(("connectport == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	576 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	577 }
407 ea0929224294 Fix another leak found by Klocwork Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	578 *connectport = '\0';
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	579 connectport++;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	580
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	581 newfwd = (struct TCPFwdList*)m_malloc(sizeof(struct TCPFwdList));
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	582
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	583 /* 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	584 * 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	585 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	586 TRACE(("bad listenport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	587 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	588 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	589
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	590 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	591 TRACE(("bad connectport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	592 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	593 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	594
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	595 newfwd->connectaddr = connectaddr;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	596
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	597 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	598 TRACE(("listenport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	599 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	600 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	601
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	602 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	603 TRACE(("connectport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	604 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	605 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	606
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	607 newfwd->next = *fwdlist;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	608 *fwdlist = newfwd;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	609
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	610 TRACE(("leave addforward: done"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	611 return;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	612
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	613 fail:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	614 dropbear_exit("Bad TCP forward '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	615
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	616 badport:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	617 dropbear_exit("Bad TCP port in '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	618 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	619 #endif

Mercurial > dropbear

annotate cli-runopts.c @ 496:9f583f4d59a6