dropbear: cli-runopts.c annotate

annotate cli-runopts.c @ 1182:a1b116c5ccb8

Added signature for changeset af074dbcb68f

author	Matt Johnston <matt@ucc.asn.au>
date	Wed, 25 Nov 2015 23:30:44 +0800
parents	c745f720ae2e
children	978887222d29

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
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	41 static void loadidentityfile(const char* filename, int warnfail);
47 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
716 af4ef98b8591 Add URL to usage text Matt Johnston <matt@ucc.asn.au> parents: 697 diff changeset	52 fprintf(stderr, "Dropbear SSH client v%s https://matt.ucc.asn.au/dropbear/dropbear.html\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
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	58 "-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	59 "-l <username>\n"
56 6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	60 "-t Allocate a pty\n"
6f091656c100 newlines which weren't there Matt Johnston <matt@ucc.asn.au> parents: 47 diff changeset	61 "-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	62 "-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	63 "-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	64 "-y Always accept remote host key if unknown\n"
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	65 "-y -y Don't perform any remote host key checking (caution)\n"
697 aadfa8de977d improve subsystem/sftp documentation, and multi-hop manual formatting Matt Johnston <matt@ucc.asn.au> parents: 682 diff changeset	66 "-s Request a subsystem (use by external 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
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	68 "-i <identityfile> (multiple allowed, default %s)\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
580 dd9947170fc8 - fixes for listenaddr Matt Johnston <matt@ucc.asn.au> parents: 579 diff changeset	74 "-L <[listenaddress:]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
580 dd9947170fc8 - fixes for listenaddr Matt Johnston <matt@ucc.asn.au> parents: 579 diff changeset	78 "-R <[listenaddress:]listenport:remotehost:remoteport> Remote port forwarding\n"
62 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
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	89 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	90 "-c <cipher list> Specify preferred ciphers ('-c help' to list options)\n"
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	91 "-m <MAC list> Specify preferred MACs for packet verification (or '-m help')\n"
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	92 #endif
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	93 "-V Version\n"
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	94 #ifdef DEBUG_TRACE
509 4e251543b941 LICENSE - Update copyright to 2008 Matt Johnston <matt@ucc.asn.au> parents: 505 diff changeset	95 "-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	96 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	97 ,DROPBEAR_VERSION, cli_opts.progname,
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	98 #ifdef ENABLE_CLI_PUBKEY_AUTH
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	99 DROPBEAR_DEFAULT_CLI_AUTHKEY,
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	100 #endif
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	101 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	102
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 }
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 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	106 unsigned int i, j;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 char ** next = 0;
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	108 enum {
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	109 #ifdef ENABLE_CLI_PUBKEY_AUTH
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	110 OPT_AUTHKEY,
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	111 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	112 #ifdef ENABLE_CLI_LOCALTCPFWD
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	113 OPT_LOCALTCPFWD,
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	114 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	115 #ifdef ENABLE_CLI_REMOTETCPFWD
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	116 OPT_REMOTETCPFWD,
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	117 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	118 #ifdef ENABLE_CLI_NETCAT
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	119 OPT_NETCAT,
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	120 #endif
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	121 /* a flag (no arg) if 'next' is NULL, a string-valued option otherwise */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	122 OPT_OTHER
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	123 } opt;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	124 unsigned int cmdlen;
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	125 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	126
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	127 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	128 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	129 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	130 char *host_arg = NULL;
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	131 char c;
459 f4addc06745b Make sure declarations of variables are at the top of function, Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	132
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 /* 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	134 cli_opts.progname = argv[0];
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 cli_opts.remotehost = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 cli_opts.remoteport = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 cli_opts.username = NULL;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 cli_opts.cmd = NULL;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	139 cli_opts.no_cmd = 0;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	140 cli_opts.backgrounded = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	141 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	142 cli_opts.always_accept_key = 0;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	143 cli_opts.no_hostkey_check = 0;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	144 cli_opts.is_subsystem = 0;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	145 #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	146 cli_opts.privkeys = list_new();
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	147 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	148 #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	149 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	150 opts.listen_fwd_all = 0;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	151 #endif
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	152 #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	153 cli_opts.remotefwds = list_new();
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	154 #endif
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	155 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	156 cli_opts.agent_fwd = 0;
674 1291413c7c7e Initialise agent_fd to -1 so we don't end up closing stdin (fd 0) Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	157 cli_opts.agent_fd = -1;
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	158 cli_opts.agent_keys_loaded = 0;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	159 #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	160 #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	161 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	162 #endif
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	163 #ifndef DISABLE_ZLIB
996 47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 995 diff changeset	164 opts.compress_mode = DROPBEAR_COMPRESS_ON;
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	165 #endif
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	166 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	167 opts.cipher_list = NULL;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	168 opts.mac_list = NULL;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	169 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 /* not yet
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 opts.ipv4 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 opts.ipv6 = 1;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 */
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	174 opts.recv_window = DEFAULT_RECV_WINDOW;
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 895 diff changeset	175 opts.keepalive_secs = DEFAULT_KEEPALIVE;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 895 diff changeset	176 opts.idle_timeout_secs = DEFAULT_IDLE_TIMEOUT;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	178 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	179
1171 c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	180 for (i = 1; i < (unsigned int)argc; i++) {
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	181 /* Handle non-flag arguments such as hostname or commands for the remote host */
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	182 if (argv[i][0] != '-')
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	183 {
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	184 if (host_arg == NULL) {
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	185 host_arg = argv[i];
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	186 continue;
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	187 }
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	188 /* Commands to pass to the remote host. No more flag handling,
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	189 commands are consumed below */
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	190 break;
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	191 }
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	192
c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	193 /* Begins with '-' */
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	194 opt = OPT_OTHER;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	195 for (j = 1; (c = argv[i][j]) != '\0' && !next && opt == OPT_OTHER; j++) {
1153 67d8a904f5a9 don't silently ignore extra flag arguments Matt Johnston <matt@ucc.asn.au> parents: 1134 diff changeset	196 switch (c) {
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	197 case 'y': /* always accept the remote hostkey */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	198 if (cli_opts.always_accept_key) {
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	199 /* twice means no checking at all */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	200 cli_opts.no_hostkey_check = 1;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	201 }
418 ab57ba0cb667 Add '-y' option to dbclient to accept the host key without checking Matt Johnston <matt@ucc.asn.au> parents: 412 diff changeset	202 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	203 break;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	204 case 'p': /* remoteport */
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	205 next = &cli_opts.remoteport;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 break;
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	207 #ifdef ENABLE_CLI_PUBKEY_AUTH
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	208 case 'i': /* an identityfile */
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	209 opt = OPT_AUTHKEY;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 break;
0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 #endif
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	212 case 't': /* we want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	213 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	214 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	215 case 'T': /* don't want a pty */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	216 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	217 break;
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	218 case 'N':
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	219 cli_opts.no_cmd = 1;
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	220 break;
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	221 case 'f':
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	222 cli_opts.backgrounded = 1;
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	223 break;
497 ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	224 case 's':
ae600f1eef81 - Enable -s for specifying a subsystem (such as sftp) Matt Johnston <matt@ucc.asn.au> parents: 494 diff changeset	225 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	226 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	227 #ifdef ENABLE_CLI_LOCALTCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	228 case 'L':
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	229 opt = OPT_LOCALTCPFWD;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	230 break;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	231 case 'g':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	232 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	233 break;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	234 #endif
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	235 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	236 case 'R':
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	237 opt = OPT_REMOTETCPFWD;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	238 break;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	239 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	240 #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	241 case 'B':
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	242 opt = OPT_NETCAT;
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	243 break;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	244 #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	245 #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	246 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	247 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	248 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	249 #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	250 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	251 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	252 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	253 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	254 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	255 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	256 break;
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 418 diff changeset	257 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	258 /* 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	259 break;
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	260 case 'W':
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	261 next = &recv_window_arg;
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	262 break;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	263 case 'K':
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	264 next = &keepalive_arg;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	265 break;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	266 case 'I':
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	267 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	268 break;
225 ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	269 #ifdef ENABLE_CLI_AGENTFWD
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	270 case 'A':
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	271 cli_opts.agent_fwd = 1;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	272 break;
ca7e76d981d9 - progress towards client agent forwarding Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	273 #endif
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	274 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	275 case 'c':
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	276 next = &opts.cipher_list;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	277 break;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	278 case 'm':
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	279 next = &opts.mac_list;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	280 break;
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 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':
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	289 #ifndef ENABLE_USER_ALGO_LIST
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	290 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	291 case 'm':
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	292 #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	293 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	294 #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	295 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	296 #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	297 #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	298 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	299 #endif
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	300 case 'V':
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	301 print_version();
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	302 exit(EXIT_SUCCESS);
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	303 break;
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	304 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	305 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	306 next = &dummy;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 default:
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	308 fprintf(stderr,
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	309 "WARNING: Ignoring unknown option -%c\n", c);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 break;
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	311 } /* Switch */
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	312 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	313
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	314 if (!next && opt == OPT_OTHER) /* got a flag */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	315 continue;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	316
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	317 if (c == '\0') {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	318 i++;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	319 j = 0;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	320 if (!argv[i])
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	321 dropbear_exit("Missing argument");
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	322 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	323
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	324 #ifdef ENABLE_CLI_PUBKEY_AUTH
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	325 if (opt == OPT_AUTHKEY) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	326 TRACE(("opt authkey"))
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	327 loadidentityfile(&argv[i][j], 1);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	328 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	329 else
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	330 #endif
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	331 #ifdef ENABLE_CLI_REMOTETCPFWD
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	332 if (opt == OPT_REMOTETCPFWD) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	333 TRACE(("opt remotetcpfwd"))
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	334 addforward(&argv[i][j], cli_opts.remotefwds);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	335 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	336 else
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	337 #endif
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	338 #ifdef ENABLE_CLI_LOCALTCPFWD
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	339 if (opt == OPT_LOCALTCPFWD) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	340 TRACE(("opt localtcpfwd"))
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	341 addforward(&argv[i][j], cli_opts.localfwds);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	342 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	343 else
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	344 #endif
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	345 #ifdef ENABLE_CLI_NETCAT
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	346 if (opt == OPT_NETCAT) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	347 TRACE(("opt netcat"))
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	348 add_netcat(&argv[i][j]);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	349 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	350 else
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	351 #endif
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	352 if (next) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	353 /* The previous flag set a value to assign */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	354 *next = &argv[i][j];
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	355 if (*next == NULL)
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	356 dropbear_exit("Invalid null argument");
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	357 next = NULL;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	358 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	359 }
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	360
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	361 /* Done with options/flags; now handle the hostname (which may not
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	362 * start with a hyphen) and optional command */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	363
1171 c745f720ae2e Fix flags after the hostname Matt Johnston <matt@ucc.asn.au> parents: 1170 diff changeset	364 if (host_arg == NULL) { /* missing hostname */
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	365 printhelp();
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	366 exit(EXIT_FAILURE);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	367 }
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	368 TRACE(("host is: %s", host_arg))
46 3bea78e1b175 Filled out a bit, with commandline support etc Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	369
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	370 if (i < (unsigned int)argc) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	371 /* Build the command to send */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	372 cmdlen = 0;
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	373 for (j = i; j < (unsigned int)argc; j++)
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	374 cmdlen += strlen(argv[j]) + 1; /* +1 for spaces */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	375
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	376 /* Allocate the space */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	377 cli_opts.cmd = (char*)m_malloc(cmdlen);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	378 cli_opts.cmd[0] = '\0';
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	379
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	380 /* Append all the bits */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	381 for (j = i; j < (unsigned int)argc; j++) {
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	382 strlcat(cli_opts.cmd, argv[j], cmdlen);
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	383 strlcat(cli_opts.cmd, " ", cmdlen);
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 }
1170 ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	385 /* It'll be null-terminated here */
ff9bd50f1457 Bundling for dbclient Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	386 TRACE(("cmd is: %s", cli_opts.cmd))
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	388
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	389 /* 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	390
682 4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	391 #ifdef ENABLE_USER_ALGO_LIST
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	392 parse_ciphers_macs();
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	393 #endif
4edea9f363d0 Add rough support for choosing ciphers/hashes with "-c" or "-m" Matt Johnston <matt@ucc.asn.au> parents: 674 diff changeset	394
812 c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	395 #ifdef ENABLE_CLI_PROXYCMD
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	396 if (cli_opts.proxycmd) {
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	397 /* To match the common path of m_freeing it */
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	398 cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	399 }
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	400 #endif
c936abfa9935 strdup the proxycmd to avoid crash when freeing, from Lluís Batlle i Rossell Matt Johnston <matt@ucc.asn.au> parents: 784 diff changeset	401
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	402 if (cli_opts.remoteport == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	403 cli_opts.remoteport = "22";
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	404 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	405
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	406 /* 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	407 * there's a command, but we do otherwise */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	408 if (cli_opts.wantpty == 9) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	409 if (cli_opts.cmd == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	410 cli_opts.wantpty = 1;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	411 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	412 cli_opts.wantpty = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	413 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	414 }
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	415
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	416 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	417 && cli_opts.no_cmd == 0) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 580 diff changeset	418 dropbear_exit("Command required for -f");
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	419 }
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	420
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	421 if (recv_window_arg) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	422 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	423 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	424 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	425 }
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	426 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	427 if (keepalive_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	428 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	429 if (m_str_to_uint(keepalive_arg, &val) == DROPBEAR_FAILURE) {
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	430 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	431 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	432 opts.keepalive_secs = val;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	433 }
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	434
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	435 if (idle_timeout_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	436 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	437 if (m_str_to_uint(idle_timeout_arg, &val) == DROPBEAR_FAILURE) {
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	438 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	439 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	440 opts.idle_timeout_secs = val;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	441 }
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 509 diff changeset	442
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	443 #ifdef ENABLE_CLI_NETCAT
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	444 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	445 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	446 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	447 #endif
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	448
1085 ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	449 #if defined(DROPBEAR_DEFAULT_CLI_AUTHKEY) && defined(ENABLE_CLI_PUBKEY_AUTH)
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	450 {
1134 36557295418e change DROPBEAR_DEFAULT_CLI_AUTHKEY to just prepend homedir Matt Johnston <matt@ucc.asn.au> parents: 1085 diff changeset	451 char *expand_path = expand_homedir_path(DROPBEAR_DEFAULT_CLI_AUTHKEY);
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	452 loadidentityfile(expand_path, 0);
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	453 m_free(expand_path);
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	454 }
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	455 #endif
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	456
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	457 /* 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	458 * 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	459 * 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	460 #ifdef ENABLE_CLI_MULTIHOP
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	461 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	462 #else
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	463 parse_hostname(host_arg);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	464 #endif
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	466
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	467 #ifdef ENABLE_CLI_PUBKEY_AUTH
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	468 static void loadidentityfile(const char* filename, int warnfail) {
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	469 sign_key *key;
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 812 diff changeset	470 enum signkey_type keytype;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	471
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	472 TRACE(("loadidentityfile %s", filename))
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	473
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	474 key = new_sign_key();
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	475 keytype = DROPBEAR_SIGNKEY_ANY;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	476 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) {
995 6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	477 if (warnfail) {
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	478 fprintf(stderr, "Failed loading keyfile '%s'\n", filename);
6fb4c010c448 Default client key path ~/.ssh/id_dropbear Matt Johnston <matt@ucc.asn.au> parents: 961 diff changeset	479 }
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	480 sign_key_free(key);
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	481 } 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	482 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	483 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	484 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	485 list_append(cli_opts.privkeys, key);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	486 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	487 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	488 #endif
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	489
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	490 #ifdef ENABLE_CLI_MULTIHOP
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	491
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	492 static char*
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	493 multihop_passthrough_args() {
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	494 char *ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	495 int total;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	496 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	497 m_list_elem *iter;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	498 /* Fill out -i, -y, -W options that make sense for all
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	499 * the intermediate processes */
1085 ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	500 #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	501 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	502 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	503 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	504 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	505 }
1085 ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	506 #endif /* ENABLE_CLI_PUBKEY_AUTH */
ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	507
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	508 len += 30; /* space for -W <size>, terminator. */
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	509 ret = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	510 total = 0;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	511
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	512 if (cli_opts.no_hostkey_check)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	513 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	514 int written = snprintf(ret+total, len-total, "-y -y ");
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	515 total += written;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	516 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	517 else if (cli_opts.always_accept_key)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	518 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	519 int written = snprintf(ret+total, len-total, "-y ");
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	520 total += written;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	521 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	522
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	523 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	524 {
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	525 int written = snprintf(ret+total, len-total, "-W %d ", opts.recv_window);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	526 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	527 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	528
1085 ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	529 #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	530 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	531 {
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	532 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	533 const size_t size = len - total;
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	534 int written = snprintf(ret+total, size, "-i %s ", key->filename);
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 551 diff changeset	535 dropbear_assert((unsigned int)written < size);
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	536 total += written;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	537 }
1085 ad14e2e71190 Fix building when ENABLE_CLI_PUBKEY_AUTH is unset Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	538 #endif /* ENABLE_CLI_PUBKEY_AUTH */
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	539
776 f7c8b786e595 changelog updates for 2013.57 Matt Johnston <matt@ucc.asn.au> parents: 772 diff changeset	540 /* if args were passed, total will be not zero, and it will have a space at the end, so remove that */
772 7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	541 if (total > 0)
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	542 {
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	543 total--;
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	544 }
7fc0aeada79c -y -y to disable hostkey checking Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	545
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	546 return ret;
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	547 }
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	548
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	549 /* 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	550 * 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	551 * 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	552 * dbclient wrt,madako,canyons
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	553 * then we want to run:
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	554 * 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	555 * 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	556 * 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	557 * 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	558 *
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	559 * 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	560 */
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	561 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	562 char *userhostarg = NULL;
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	563 char *hostbuf = NULL;
574 b6665c1eac43 Remove extraneous semicolon Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	564 char *last_hop = NULL;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	565 char *remainder = NULL;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	566
494 66eac4631d88 - Work around rsync and scp parsing and modifying the user@host argument, Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	567 /* 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	568 * 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	569 * 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	570 * 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	571 * 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	572 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	573 && 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	574 && 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	575 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	576 hostbuf = m_malloc(len);
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	577 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	578 } else {
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	579 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	580 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	581 userhostarg = hostbuf;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	582
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	583 last_hop = strrchr(userhostarg, ',');
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	584 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	585 if (last_hop == userhostarg) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	586 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	587 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	588 *last_hop = '\0';
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	589 last_hop++;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	590 remainder = userhostarg;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	591 userhostarg = last_hop;
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	592 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	593
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	594 parse_hostname(userhostarg);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	595
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	596 if (last_hop) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	597 /* Set up the proxycmd */
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	598 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	599 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	600 if (cli_opts.proxycmd) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	601 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	602 }
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	603 if (cli_opts.remoteport == NULL) {
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	604 cli_opts.remoteport = "22";
2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	605 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	606 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	607 + 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	608 + strlen(passthrough_args)
9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	609 + 30;
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	610 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	611 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	612 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	613 passthrough_args, remainder);
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	614 #ifndef DISABLE_ZLIB
f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	615 /* The stream will be incompressible since it's encrypted. */
996 47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 995 diff changeset	616 opts.compress_mode = DROPBEAR_COMPRESS_OFF;
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 574 diff changeset	617 #endif
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	618 m_free(passthrough_args);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	619 }
544 9e51707cd6f2 - Make -i and -W pass through multihop arguments Matt Johnston <matt@ucc.asn.au> parents: 541 diff changeset	620 m_free(hostbuf);
487 2e17f82a7330 Add multihop 'onion-forwarding' mode. Needs refinement, works. Matt Johnston <matt@ucc.asn.au> parents: 486 diff changeset	621 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	622 #endif /* !ENABLE_CLI_MULTIHOP */
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	623
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	624 /* Parses a [user@]hostname[/port] argument. */
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	625 static void parse_hostname(const char* orighostarg) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	626 char *userhostarg = NULL;
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	627 char *port = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	628
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	629 userhostarg = m_strdup(orighostarg);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	630
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	631 cli_opts.remotehost = strchr(userhostarg, '@');
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	632 if (cli_opts.remotehost == NULL) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	633 /* 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	634 * local user's name */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	635 cli_opts.remotehost = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	636 } else {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	637 cli_opts.remotehost[0] = '\0'; /* Split the user/host */
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	638 cli_opts.remotehost++;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	639 cli_opts.username = userhostarg;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	640 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	641
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	642 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	643 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	644 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	645
895 5608a5a61c2a Change port separator to ^ since % is used in ipv6 addresses Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	646 port = strchr(cli_opts.remotehost, '^');
783 34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	647 if (!port) {
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	648 /* legacy separator */
783 34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	649 port = strchr(cli_opts.remotehost, '/');
34e69908b3f7 Use '#' for host#port separator, document it. This fixes scp Matt Johnston <matt@ucc.asn.au> parents: 776 diff changeset	650 }
489 79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	651 if (port) {
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	652 *port = '\0';
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	653 cli_opts.remoteport = port+1;
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	654 }
79c657a673ec - Allow specifying a port with host/port. Matt Johnston <matt@ucc.asn.au> parents: 487 diff changeset	655
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	656 if (cli_opts.remotehost[0] == '\0') {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	657 dropbear_exit("Bad hostname");
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	658 }
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 46 diff changeset	659 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	660
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	661 #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	662 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	663 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	664
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	665 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	666
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	667 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	668 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	669 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	670 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	671 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	672 *portstr = '\0';
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	673 portstr++;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	674
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	675 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	676 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	677 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	678 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	679
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	680 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	681 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	682 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	683 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	684
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	685 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	686 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	687 goto fail;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	688 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	689
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	690 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	691 return;
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	692
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	693 fail:
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	694 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	695 }
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	696 #endif
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 459 diff changeset	697
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	698 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	699 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	700 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	701
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	702 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	703
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	704 pw = getpwuid(uid);
961 a4032b946355 Be a bit safer in case pw_name doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 958 diff changeset	705 if (pw && pw->pw_name != NULL) {
a4032b946355 Be a bit safer in case pw_name doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 958 diff changeset	706 cli_opts.own_user = m_strdup(pw->pw_name);
a4032b946355 Be a bit safer in case pw_name doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 958 diff changeset	707 } else {
958 1bf92da7a2a0 Try without identifying current user iquaba <cooka2011@gmail.com> parents: 946 diff changeset	708 dropbear_log(LOG_INFO, "Warning: failed to identify current user. Trying anyway.");
961 a4032b946355 Be a bit safer in case pw_name doesn't exist Matt Johnston <matt@ucc.asn.au> parents: 958 diff changeset	709 cli_opts.own_user = m_strdup("unknown");
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	710 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	711
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	712 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	713
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	714 #ifdef ENABLE_CLI_ANYTCPFWD
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	715 /* Turn a "[listenaddr:]listenport:remoteaddr:remoteport" string into into a forwarding
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	716 * 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	717 static void addforward(const char* origstr, m_list *fwdlist) {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	718
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	719 char part1 = NULL, part2 = NULL, part3 = NULL, part4 = NULL;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	720 char * listenaddr = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	721 char * listenport = NULL;
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	722 char * connectaddr = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	723 char * connectport = 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	724 struct TCPFwdEntry* newfwd = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	725 char * str = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	726
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	727 TRACE(("enter addforward"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	728
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	729 /* 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	730 is never free()d. */
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	731 str = m_strdup(origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	732
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	733 part1 = str;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	734
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	735 part2 = strchr(str, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	736 if (part2 == NULL) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	737 TRACE(("part2 == NULL"))
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	738 goto fail;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	739 }
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	740 *part2 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	741 part2++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	742
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	743 part3 = strchr(part2, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	744 if (part3 == NULL) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	745 TRACE(("part3 == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	746 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	747 }
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	748 *part3 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	749 part3++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	750
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	751 part4 = strchr(part3, ':');
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	752 if (part4) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	753 *part4 = '\0';
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	754 part4++;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	755 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	756
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	757 if (part4) {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	758 listenaddr = part1;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	759 listenport = part2;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	760 connectaddr = part3;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	761 connectport = part4;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	762 } else {
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	763 listenaddr = NULL;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	764 listenport = part1;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	765 connectaddr = part2;
44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	766 connectport = part3;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	767 }
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	768
551 c3f2ec71e3d4 New standard linked list to use, rather than adhoc SignKeyList or TCPFwdList Matt Johnston <matt@ucc.asn.au> parents: 546 diff changeset	769 newfwd = m_malloc(sizeof(struct TCPFwdEntry));
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	770
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	771 /* 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	772 * 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	773 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	774 TRACE(("bad listenport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	775 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	776 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	777
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 489 diff changeset	778 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	779 TRACE(("bad connectport strtoul"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	780 goto fail;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	781 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	782
578 44f486b72427 - tcpfwd bindaddr support against trunk. needs merging. Matt Johnston <matt@ucc.asn.au> parents: 575 diff changeset	783 newfwd->listenaddr = listenaddr;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	784 newfwd->connectaddr = connectaddr;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	785
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	786 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	787 TRACE(("listenport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	788 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	789 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	790
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	791 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	792 TRACE(("connectport > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	793 goto badport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	794 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	795
505 805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 497 diff changeset	796 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	797 list_append(fwdlist, newfwd);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	798
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	799 TRACE(("leave addforward: done"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	800 return;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	801
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	802 fail:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	803 dropbear_exit("Bad TCP forward '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	804
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	805 badport:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	806 dropbear_exit("Bad TCP port in '%s'", origstr);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	807 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	808 #endif

Mercurial > dropbear

annotate cli-runopts.c @ 1182:a1b116c5ccb8