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