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