Mercurial > dropbear
annotate cli-runopts.c @ 423:b2b67cfcd66e channel-fix
- Fix bug in child-exit handling where the wrong pid was being matched.
- Also wait for errfd to close before closing the channel
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Mon, 12 Feb 2007 10:39:22 +0000 |
parents | ab57ba0cb667 |
children | d82a2a44c684 |
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(); |
36 static void parsehostname(char* userhostarg); | |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
37 #ifdef ENABLE_CLI_PUBKEY_AUTH |
47 | 38 static void loadidentityfile(const char* filename); |
39 #endif | |
64 | 40 #ifdef ENABLE_CLI_ANYTCPFWD |
41 static void addforward(char* str, struct TCPFwdList** fwdlist); | |
42 #endif | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
43 |
47 | 44 static void printhelp() { |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
45 |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
46 fprintf(stderr, "Dropbear client v%s\n" |
333
9341570412e5
mention a command in the help
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
47 "Usage: %s [options] [user@]host [command]\n" |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
48 "Options are:\n" |
47 | 49 "-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
|
50 "-l <username>\n" |
56
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
51 "-t Allocate a pty\n" |
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
52 "-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
|
53 "-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
|
54 "-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
|
55 "-y Always accept remote host key if unknown\n" |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
56 #ifdef ENABLE_CLI_PUBKEY_AUTH |
56
6f091656c100
newlines which weren't there
Matt Johnston <matt@ucc.asn.au>
parents:
47
diff
changeset
|
57 "-i <identityfile> (multiple allowed)\n" |
47 | 58 #endif |
64 | 59 #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
|
60 "-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
|
61 "-g Allow remote hosts to connect to forwarded ports\n" |
62 | 62 #endif |
64 | 63 #ifdef ENABLE_CLI_REMOTETCPFWD |
62 | 64 "-R <listenport:remotehost:remoteport> Remote port forwarding\n" |
65 #endif | |
94
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
66 #ifdef DEBUG_TRACE |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
67 "-v verbose\n" |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
68 #endif |
47 | 69 ,DROPBEAR_VERSION, cli_opts.progname); |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
70 } |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
71 |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
72 void cli_getopts(int argc, char ** argv) { |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
73 |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
74 unsigned int i, j; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
75 char ** next = 0; |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
76 unsigned int cmdlen; |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
77 #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
|
78 int nextiskey = 0; /* A flag if the next argument is a keyfile */ |
47 | 79 #endif |
64 | 80 #ifdef ENABLE_CLI_LOCALTCPFWD |
62 | 81 int nextislocal = 0; |
82 #endif | |
64 | 83 #ifdef ENABLE_CLI_REMOTETCPFWD |
62 | 84 int nextisremote = 0; |
85 #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
|
86 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
|
87 |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
88 /* 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
|
89 cli_opts.progname = argv[0]; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
90 cli_opts.remotehost = NULL; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
91 cli_opts.remoteport = NULL; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
92 cli_opts.username = NULL; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
93 cli_opts.cmd = NULL; |
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
94 cli_opts.no_cmd = 0; |
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
95 cli_opts.backgrounded = 0; |
47 | 96 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
|
97 cli_opts.always_accept_key = 0; |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
98 #ifdef ENABLE_CLI_PUBKEY_AUTH |
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
99 cli_opts.privkeys = NULL; |
47 | 100 #endif |
64 | 101 #ifdef ENABLE_CLI_LOCALTCPFWD |
102 cli_opts.localfwds = NULL; | |
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
103 opts.listen_fwd_all = 0; |
62 | 104 #endif |
64 | 105 #ifdef ENABLE_CLI_REMOTETCPFWD |
106 cli_opts.remotefwds = NULL; | |
62 | 107 #endif |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
108 /* not yet |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
109 opts.ipv4 = 1; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
110 opts.ipv6 = 1; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
111 */ |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
112 |
47 | 113 /* Iterate all the arguments */ |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
114 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
|
115 #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
|
116 if (nextiskey) { |
47 | 117 /* Load a hostkey since the previous argument was "-i" */ |
118 loadidentityfile(argv[i]); | |
119 nextiskey = 0; | |
120 continue; | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
121 } |
47 | 122 #endif |
64 | 123 #ifdef ENABLE_CLI_REMOTETCPFWD |
124 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
|
125 TRACE(("nextisremote true")) |
64 | 126 addforward(argv[i], &cli_opts.remotefwds); |
127 nextisremote = 0; | |
128 continue; | |
129 } | |
130 #endif | |
131 #ifdef ENABLE_CLI_LOCALTCPFWD | |
132 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
|
133 TRACE(("nextislocal true")) |
64 | 134 addforward(argv[i], &cli_opts.localfwds); |
135 nextislocal = 0; | |
136 continue; | |
137 } | |
138 #endif | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
139 if (next) { |
47 | 140 /* 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
|
141 *next = argv[i]; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
142 if (*next == NULL) { |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
143 dropbear_exit("Invalid null argument"); |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
144 } |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
145 next = NULL; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
146 continue; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
147 } |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
148 |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
149 if (argv[i][0] == '-') { |
47 | 150 /* A flag *waves* */ |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
151 |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
152 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
|
153 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
|
154 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
|
155 break; |
47 | 156 case 'p': /* remoteport */ |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
157 next = &cli_opts.remoteport; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
158 break; |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
159 #ifdef ENABLE_CLI_PUBKEY_AUTH |
47 | 160 case 'i': /* an identityfile */ |
134 | 161 /* Keep scp happy when it changes "-i file" to "-ifile" */ |
162 if (strlen(argv[i]) > 2) { | |
163 loadidentityfile(&argv[i][2]); | |
164 } else { | |
165 nextiskey = 1; | |
166 } | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
167 break; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
168 #endif |
47 | 169 case 't': /* we want a pty */ |
170 cli_opts.wantpty = 1; | |
171 break; | |
172 case 'T': /* don't want a pty */ | |
173 cli_opts.wantpty = 0; | |
174 break; | |
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
175 case 'N': |
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
176 cli_opts.no_cmd = 1; |
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
177 break; |
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
178 case 'f': |
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
179 cli_opts.backgrounded = 1; |
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
180 break; |
64 | 181 #ifdef ENABLE_CLI_LOCALTCPFWD |
182 case 'L': | |
183 nextislocal = 1; | |
184 break; | |
258
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
185 case 'g': |
306499676384
* add -g (dbclient) and -a (dropbear) options for allowing non-local
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
186 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
|
187 break; |
64 | 188 #endif |
189 #ifdef ENABLE_CLI_REMOTETCPFWD | |
190 case 'R': | |
191 nextisremote = 1; | |
192 break; | |
193 #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
|
194 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
|
195 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
|
196 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
|
197 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
|
198 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
|
199 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
|
200 break; |
94
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
201 #ifdef DEBUG_TRACE |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
202 case 'v': |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
203 debug_trace = 1; |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
204 break; |
c85c88500ea6
DEBUG_TRACE now only triggers with -v on the cmdline
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
205 #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
|
206 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
|
207 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
|
208 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
|
209 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
|
210 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
|
211 #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
|
212 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
|
213 #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
|
214 #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
|
215 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
|
216 #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
|
217 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
|
218 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
|
219 next = &dummy; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
220 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
|
221 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
|
222 "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
|
223 break; |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
224 } /* Switch */ |
105 | 225 |
226 /* Now we handle args where they might be "-luser" (no spaces)*/ | |
227 if (next && strlen(argv[i]) > 2) { | |
228 *next = &argv[i][2]; | |
229 next = NULL; | |
230 } | |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
231 |
47 | 232 continue; /* next argument */ |
233 | |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
234 } 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
|
235 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
|
236 |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
237 /* Either the hostname or commands */ |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
238 |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
239 if (cli_opts.remotehost == NULL) { |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
240 |
47 | 241 parsehostname(argv[i]); |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
242 |
47 | 243 } else { |
46
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
244 |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
245 /* 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
|
246 * 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
|
247 * command */ |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
248 cmdlen = 0; |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
249 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
|
250 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
|
251 } |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
252 /* Allocate the space */ |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
253 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
|
254 cli_opts.cmd[0] = '\0'; |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
255 |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
256 /* Append all the bits */ |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
257 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
|
258 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
|
259 strlcat(cli_opts.cmd, " ", cmdlen); |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
260 } |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
261 /* 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
|
262 |
3bea78e1b175
Filled out a bit, with commandline support etc
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
263 /* 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
|
264 break; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
265 } |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
266 } |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
267 } |
47 | 268 |
269 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
|
270 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
|
271 exit(EXIT_FAILURE); |
47 | 272 } |
273 | |
274 if (cli_opts.remoteport == NULL) { | |
275 cli_opts.remoteport = "22"; | |
276 } | |
277 | |
278 /* If not explicitly specified with -t or -T, we don't want a pty if | |
279 * there's a command, but we do otherwise */ | |
280 if (cli_opts.wantpty == 9) { | |
281 if (cli_opts.cmd == NULL) { | |
282 cli_opts.wantpty = 1; | |
283 } else { | |
284 cli_opts.wantpty = 0; | |
285 } | |
286 } | |
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
287 |
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
288 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
|
289 && cli_opts.no_cmd == 0) { |
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
290 dropbear_exit("command required for -f"); |
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
291 } |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
diff
changeset
|
292 } |
47 | 293 |
68
eee77ac31ccc
cleaning up the pubkey defines
Matt Johnston <matt@ucc.asn.au>
parents:
66
diff
changeset
|
294 #ifdef ENABLE_CLI_PUBKEY_AUTH |
47 | 295 static void loadidentityfile(const char* filename) { |
296 | |
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
297 struct SignKeyList * nextkey; |
47 | 298 sign_key *key; |
299 int keytype; | |
300 | |
301 key = new_sign_key(); | |
302 keytype = DROPBEAR_SIGNKEY_ANY; | |
303 if ( readhostkey(filename, key, &keytype) != DROPBEAR_SUCCESS ) { | |
304 | |
305 fprintf(stderr, "Failed loading keyfile '%s'\n", filename); | |
306 sign_key_free(key); | |
307 | |
308 } else { | |
309 | |
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
310 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); |
47 | 311 nextkey->key = key; |
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
312 nextkey->next = cli_opts.privkeys; |
47 | 313 nextkey->type = keytype; |
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
181
diff
changeset
|
314 cli_opts.privkeys = nextkey; |
47 | 315 } |
316 } | |
317 #endif | |
318 | |
319 | |
320 /* Parses a [user@]hostname argument. userhostarg is the argv[i] corresponding | |
321 * - note that it will be modified */ | |
64 | 322 static void parsehostname(char* orighostarg) { |
47 | 323 |
324 uid_t uid; | |
325 struct passwd *pw = NULL; | |
64 | 326 char *userhostarg = NULL; |
327 | |
328 /* We probably don't want to be editing argvs */ | |
329 userhostarg = m_strdup(orighostarg); | |
47 | 330 |
331 cli_opts.remotehost = strchr(userhostarg, '@'); | |
332 if (cli_opts.remotehost == NULL) { | |
333 /* no username portion, the cli-auth.c code can figure the | |
334 * local user's name */ | |
335 cli_opts.remotehost = userhostarg; | |
336 } else { | |
337 cli_opts.remotehost[0] = '\0'; /* Split the user/host */ | |
338 cli_opts.remotehost++; | |
339 cli_opts.username = userhostarg; | |
340 } | |
341 | |
342 if (cli_opts.username == NULL) { | |
343 uid = getuid(); | |
344 | |
345 pw = getpwuid(uid); | |
346 if (pw == NULL || pw->pw_name == NULL) { | |
347 dropbear_exit("Unknown own user"); | |
348 } | |
349 | |
350 cli_opts.username = m_strdup(pw->pw_name); | |
351 } | |
352 | |
353 if (cli_opts.remotehost[0] == '\0') { | |
354 dropbear_exit("Bad hostname"); | |
355 } | |
356 } | |
64 | 357 |
358 #ifdef ENABLE_CLI_ANYTCPFWD | |
359 /* Turn a "listenport:remoteaddr:remoteport" string into into a forwarding | |
360 * set, and add it to the forwarding list */ | |
361 static void addforward(char* origstr, struct TCPFwdList** fwdlist) { | |
362 | |
363 char * listenport = NULL; | |
364 char * connectport = NULL; | |
365 char * connectaddr = NULL; | |
366 struct TCPFwdList* newfwd = NULL; | |
367 char * str = NULL; | |
368 | |
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
|
369 TRACE(("enter addforward")) |
64 | 370 |
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
|
371 /* 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
|
372 is never free()d. */ |
64 | 373 str = m_strdup(origstr); |
374 | |
375 listenport = str; | |
376 | |
377 connectaddr = strchr(str, ':'); | |
378 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
|
379 TRACE(("connectaddr == NULL")) |
64 | 380 goto fail; |
381 } | |
407
ea0929224294
Fix another leak found by Klocwork
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
382 *connectaddr = '\0'; |
64 | 383 connectaddr++; |
384 | |
385 connectport = strchr(connectaddr, ':'); | |
386 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
|
387 TRACE(("connectport == NULL")) |
64 | 388 goto fail; |
389 } | |
407
ea0929224294
Fix another leak found by Klocwork
Matt Johnston <matt@ucc.asn.au>
parents:
258
diff
changeset
|
390 *connectport = '\0'; |
64 | 391 connectport++; |
392 | |
393 newfwd = (struct TCPFwdList*)m_malloc(sizeof(struct TCPFwdList)); | |
394 | |
395 /* Now we check the ports - note that the port ints are unsigned, | |
396 * the check later only checks for >= MAX_PORT */ | |
397 newfwd->listenport = strtol(listenport, NULL, 10); | |
398 if (errno != 0) { | |
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
|
399 TRACE(("bad listenport strtol")) |
64 | 400 goto fail; |
401 } | |
402 | |
403 newfwd->connectport = strtol(connectport, NULL, 10); | |
404 if (errno != 0) { | |
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
|
405 TRACE(("bad connectport strtol")) |
64 | 406 goto fail; |
407 } | |
408 | |
409 newfwd->connectaddr = connectaddr; | |
410 | |
411 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
|
412 TRACE(("listenport > 65535")) |
64 | 413 goto badport; |
414 } | |
415 | |
416 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
|
417 TRACE(("connectport > 65535")) |
64 | 418 goto badport; |
419 } | |
420 | |
421 newfwd->next = *fwdlist; | |
422 *fwdlist = newfwd; | |
423 | |
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
|
424 TRACE(("leave addforward: done")) |
64 | 425 return; |
426 | |
427 fail: | |
428 dropbear_exit("Bad TCP forward '%s'", origstr); | |
429 | |
430 badport: | |
431 dropbear_exit("Bad TCP port in '%s'", origstr); | |
432 } | |
433 #endif |