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