Mercurial > dropbear
annotate cli-session.c @ 741:eafdf8b363f5 kexguess
Get rid of client/server specific buf_match_algo, use single
function with a couple of if statements instead
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sat, 30 Mar 2013 23:55:05 +0800 |
| parents | d44325108d0e |
| children | cd201dc2da9a |
| rev | line source |
|---|---|
|
74
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
1 /* |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
2 * Dropbear SSH |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
3 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
4 * Copyright (c) 2002,2003 Matt Johnston |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
5 * Copyright (c) 2004 by Mihnea Stoenescu |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
6 * All rights reserved. |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
7 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
8 * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
9 * of this software and associated documentation files (the "Software"), to deal |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
10 * in the Software without restriction, including without limitation the rights |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
11 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
12 * copies of the Software, and to permit persons to whom the Software is |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
13 * furnished to do so, subject to the following conditions: |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
14 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
15 * The above copyright notice and this permission notice shall be included in |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
16 * all copies or substantial portions of the Software. |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
17 * |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
20 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
21 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
22 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
23 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
24 * SOFTWARE. */ |
|
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
25 |
| 26 | 26 #include "includes.h" |
| 27 #include "session.h" | |
| 28 #include "dbutil.h" | |
| 29 #include "kex.h" | |
| 30 #include "ssh.h" | |
| 31 #include "packet.h" | |
| 64 | 32 #include "tcpfwd.h" |
| 26 | 33 #include "channel.h" |
| 34 #include "random.h" | |
| 33 | 35 #include "service.h" |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
36 #include "runopts.h" |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
37 #include "chansession.h" |
|
547
cf376c696dfc
Make it compile, update for changes in channel structure.
Matt Johnston <matt@ucc.asn.au>
parents:
546
diff
changeset
|
38 #include "agentfwd.h" |
| 26 | 39 |
| 40 static void cli_remoteclosed(); | |
| 41 static void cli_sessionloop(); | |
| 33 | 42 static void cli_session_init(); |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
43 static void cli_finished(); |
| 26 | 44 |
| 45 struct clientsession cli_ses; /* GLOBAL */ | |
| 46 | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
47 /* Sorted in decreasing frequency will be more efficient - data and window |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
48 * should be first */ |
| 26 | 49 static const packettype cli_packettypes[] = { |
|
74
e3adf4cf5465
License boilerplate etc, add Mihnea as an author to some of the files
Matt Johnston <matt@ucc.asn.au>
parents:
68
diff
changeset
|
50 /* TYPE, FUNCTION */ |
| 26 | 51 {SSH_MSG_CHANNEL_DATA, recv_msg_channel_data}, |
| 107 | 52 {SSH_MSG_CHANNEL_EXTENDED_DATA, recv_msg_channel_extended_data}, |
| 26 | 53 {SSH_MSG_CHANNEL_WINDOW_ADJUST, recv_msg_channel_window_adjust}, |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
54 {SSH_MSG_USERAUTH_FAILURE, recv_msg_userauth_failure}, /* client */ |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
55 {SSH_MSG_USERAUTH_SUCCESS, recv_msg_userauth_success}, /* client */ |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
56 {SSH_MSG_KEXINIT, recv_msg_kexinit}, |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
57 {SSH_MSG_KEXDH_REPLY, recv_msg_kexdh_reply}, /* client */ |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
58 {SSH_MSG_NEWKEYS, recv_msg_newkeys}, |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
59 {SSH_MSG_SERVICE_ACCEPT, recv_msg_service_accept}, /* client */ |
| 26 | 60 {SSH_MSG_CHANNEL_REQUEST, recv_msg_channel_request}, |
| 61 {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open}, | |
| 62 {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof}, | |
| 63 {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close}, | |
| 64 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation}, | |
| 65 {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure}, | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
66 {SSH_MSG_USERAUTH_BANNER, recv_msg_userauth_banner}, /* client */ |
|
249
efbaf6b03837
added keyboard-interactive client support
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
67 {SSH_MSG_USERAUTH_SPECIFIC_60, recv_msg_userauth_specific_60}, /* client */ |
|
505
805e557fdff7
Report errors if a remote request fails
Matt Johnston <matt@ucc.asn.au>
parents:
486
diff
changeset
|
68 #ifdef ENABLE_CLI_REMOTETCPFWD |
|
805e557fdff7
Report errors if a remote request fails
Matt Johnston <matt@ucc.asn.au>
parents:
486
diff
changeset
|
69 {SSH_MSG_REQUEST_SUCCESS, cli_recv_msg_request_success}, /* client */ |
|
805e557fdff7
Report errors if a remote request fails
Matt Johnston <matt@ucc.asn.au>
parents:
486
diff
changeset
|
70 {SSH_MSG_REQUEST_FAILURE, cli_recv_msg_request_failure}, /* client */ |
|
805e557fdff7
Report errors if a remote request fails
Matt Johnston <matt@ucc.asn.au>
parents:
486
diff
changeset
|
71 #endif |
| 26 | 72 {0, 0} /* End */ |
| 73 }; | |
| 74 | |
| 75 static const struct ChanType *cli_chantypes[] = { | |
| 64 | 76 #ifdef ENABLE_CLI_REMOTETCPFWD |
| 77 &cli_chan_tcpremote, | |
| 78 #endif | |
|
225
ca7e76d981d9
- progress towards client agent forwarding
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
79 #ifdef ENABLE_CLI_AGENTFWD |
|
ca7e76d981d9
- progress towards client agent forwarding
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
80 &cli_chan_agent, |
|
ca7e76d981d9
- progress towards client agent forwarding
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
81 #endif |
| 26 | 82 NULL /* Null termination */ |
| 83 }; | |
| 33 | 84 |
|
568
005530560594
Rearrange getaddrstring() etc
Matt Johnston <matt@ucc.asn.au>
parents:
560
diff
changeset
|
85 void cli_session(int sock_in, int sock_out) { |
| 26 | 86 |
|
272
3be7ae2e8dfa
Only read /dev/random once when the program starts
Matt Johnston <matt@ucc.asn.au>
parents:
249
diff
changeset
|
87 seedrandom(); |
|
3be7ae2e8dfa
Only read /dev/random once when the program starts
Matt Johnston <matt@ucc.asn.au>
parents:
249
diff
changeset
|
88 |
| 26 | 89 crypto_init(); |
|
272
3be7ae2e8dfa
Only read /dev/random once when the program starts
Matt Johnston <matt@ucc.asn.au>
parents:
249
diff
changeset
|
90 |
|
568
005530560594
Rearrange getaddrstring() etc
Matt Johnston <matt@ucc.asn.au>
parents:
560
diff
changeset
|
91 common_session_init(sock_in, sock_out); |
| 26 | 92 |
| 93 chaninitialise(cli_chantypes); | |
| 94 | |
| 33 | 95 /* Set up cli_ses vars */ |
| 96 cli_session_init(); | |
| 26 | 97 |
| 98 /* Ready to go */ | |
| 99 sessinitdone = 1; | |
| 100 | |
| 101 /* Exchange identification */ | |
| 102 session_identification(); | |
| 103 | |
| 104 send_msg_kexinit(); | |
| 105 | |
| 106 session_loop(cli_sessionloop); | |
| 107 | |
| 108 /* Not reached */ | |
| 109 | |
| 33 | 110 } |
| 26 | 111 |
|
739
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
112 static void cli_send_kex_first_guess() { |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
113 send_msg_kexdh_init(); |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
114 dropbear_log(LOG_INFO, "kexdh_init guess sent"); |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
115 //cli_ses.kex_state = KEXDH_INIT_SENT; |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
116 } |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
117 |
| 33 | 118 static void cli_session_init() { |
| 119 | |
| 120 cli_ses.state = STATE_NOTHING; | |
| 121 cli_ses.kex_state = KEX_NOTHING; | |
| 122 | |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
123 cli_ses.tty_raw_mode = 0; |
|
41
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
124 cli_ses.winchange = 0; |
|
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
125 |
|
175
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
126 /* We store std{in,out,err}'s flags, so we can set them back on exit |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
127 * (otherwise busybox's ash isn't happy */ |
|
99
0247fbd9379d
Move the revert-to-non-blocking-stdin code to cli-session so it
Matt Johnston <matt@ucc.asn.au>
parents:
74
diff
changeset
|
128 cli_ses.stdincopy = dup(STDIN_FILENO); |
|
0247fbd9379d
Move the revert-to-non-blocking-stdin code to cli-session so it
Matt Johnston <matt@ucc.asn.au>
parents:
74
diff
changeset
|
129 cli_ses.stdinflags = fcntl(STDIN_FILENO, F_GETFL, 0); |
|
175
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
130 cli_ses.stdoutcopy = dup(STDOUT_FILENO); |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
131 cli_ses.stdoutflags = fcntl(STDOUT_FILENO, F_GETFL, 0); |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
132 cli_ses.stderrcopy = dup(STDERR_FILENO); |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
133 cli_ses.stderrflags = fcntl(STDERR_FILENO, F_GETFL, 0); |
|
99
0247fbd9379d
Move the revert-to-non-blocking-stdin code to cli-session so it
Matt Johnston <matt@ucc.asn.au>
parents:
74
diff
changeset
|
134 |
|
108
10f4d3319780
- added circular buffering for channels
Matt Johnston <matt@ucc.asn.au>
parents:
107
diff
changeset
|
135 cli_ses.retval = EXIT_SUCCESS; /* Assume it's clean if we don't get a |
|
10f4d3319780
- added circular buffering for channels
Matt Johnston <matt@ucc.asn.au>
parents:
107
diff
changeset
|
136 specific exit status */ |
|
10f4d3319780
- added circular buffering for channels
Matt Johnston <matt@ucc.asn.au>
parents:
107
diff
changeset
|
137 |
| 47 | 138 /* Auth */ |
|
215
aad4b3f58556
rename PubkeyList to SignKeyList for clarity
Matt Johnston <matt@ucc.asn.au>
parents:
175
diff
changeset
|
139 cli_ses.lastprivkey = NULL; |
|
136
fb7147e2fb04
- Fixed a couple of compile warnings
Matt Johnston <matt@ucc.asn.au>
parents:
108
diff
changeset
|
140 cli_ses.lastauthtype = 0; |
| 47 | 141 |
|
686
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
142 #ifdef DROPBEAR_NONE_CIPHER |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
143 cli_ses.cipher_none_after_auth = get_algo_usable(sshciphers, "none"); |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
144 set_algo_usable(sshciphers, "none", 0); |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
145 #else |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
146 cli_ses.cipher_none_after_auth = 0; |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
147 #endif |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
148 |
| 33 | 149 /* For printing "remote host closed" for the user */ |
| 150 ses.remoteclosed = cli_remoteclosed; | |
| 151 | |
| 152 /* packet handlers */ | |
| 153 ses.packettypes = cli_packettypes; | |
|
35
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
154 |
|
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
155 ses.isserver = 0; |
|
739
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
156 |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
157 ses.send_kex_first_guess = cli_send_kex_first_guess; |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
158 |
| 26 | 159 } |
| 160 | |
| 33 | 161 /* This function drives the progress of the session - it initiates KEX, |
| 162 * service, userauth and channel requests */ | |
| 26 | 163 static void cli_sessionloop() { |
| 164 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
165 TRACE(("enter cli_sessionloop")) |
| 33 | 166 |
|
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
167 if (ses.lastpacket == SSH_MSG_KEXINIT && cli_ses.kex_state == KEX_NOTHING) { |
| 33 | 168 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT |
| 169 * negotiation would have failed. */ | |
|
739
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
170 if (!ses.kexstate.our_first_follows_matches) { |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
171 dropbear_log(LOG_INFO, "kexdh_init after remote's kexinit"); |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
172 send_msg_kexdh_init(); |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
173 } |
|
d44325108d0e
first_kex_packet_follows working, needs tidying
Matt Johnston <matt@ucc.asn.au>
parents:
686
diff
changeset
|
174 cli_ses.kex_state = KEXDH_INIT_SENT; |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
175 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD")) |
| 33 | 176 return; |
| 177 } | |
| 178 | |
| 179 /* A KEX has finished, so we should go back to our KEX_NOTHING state */ | |
| 180 if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0 | |
| 181 && ses.kexstate.sentkexinit == 0) { | |
| 182 cli_ses.kex_state = KEX_NOTHING; | |
| 183 } | |
| 184 | |
| 185 /* We shouldn't do anything else if a KEX is in progress */ | |
| 186 if (cli_ses.kex_state != KEX_NOTHING) { | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
187 TRACE(("leave cli_sessionloop: kex_state != KEX_NOTHING")) |
| 33 | 188 return; |
| 189 } | |
| 190 | |
| 191 /* We should exit if we haven't donefirstkex: we shouldn't reach here | |
| 192 * in normal operation */ | |
| 193 if (ses.kexstate.donefirstkex == 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:
136
diff
changeset
|
194 TRACE(("XXX XXX might be bad! leave cli_sessionloop: haven't donefirstkex")) |
|
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
195 return; |
| 33 | 196 } |
| 197 | |
| 26 | 198 switch (cli_ses.state) { |
| 199 | |
| 33 | 200 case STATE_NOTHING: |
| 201 /* We've got the transport layer sorted, we now need to request | |
| 202 * userauth */ | |
| 203 send_msg_service_request(SSH_SERVICE_USERAUTH); | |
| 204 cli_ses.state = SERVICE_AUTH_REQ_SENT; | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
205 TRACE(("leave cli_sessionloop: sent userauth service req")) |
| 33 | 206 return; |
| 26 | 207 |
| 33 | 208 /* userauth code */ |
| 209 case SERVICE_AUTH_ACCEPT_RCVD: | |
| 210 cli_auth_getmethods(); | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
211 cli_ses.state = USERAUTH_REQ_SENT; |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
212 TRACE(("leave cli_sessionloop: sent userauth methods req")) |
| 33 | 213 return; |
| 214 | |
| 215 case USERAUTH_FAIL_RCVD: | |
| 216 cli_auth_try(); | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
217 cli_ses.state = USERAUTH_REQ_SENT; |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
218 TRACE(("leave cli_sessionloop: cli_auth_try")) |
| 33 | 219 return; |
| 220 | |
| 37 | 221 case USERAUTH_SUCCESS_RCVD: |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
222 |
|
686
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
223 #ifdef DROPBEAR_NONE_CIPHER |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
224 if (cli_ses.cipher_none_after_auth) |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
225 { |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
226 set_algo_usable(sshciphers, "none", 1); |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
227 send_msg_kexinit(); |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
228 } |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
229 #endif |
|
983a817f8e41
- Only request "none" cipher after auth has succeeded
Matt Johnston <matt@ucc.asn.au>
parents:
594
diff
changeset
|
230 |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
231 if (cli_opts.backgrounded) { |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
232 int devnull; |
|
433
c216212001fc
Fix for -pedantic -ansi compilation, change // to /**/, plus some signedness
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
233 /* keeping stdin open steals input from the terminal and |
|
c216212001fc
Fix for -pedantic -ansi compilation, change // to /**/, plus some signedness
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
234 is confusing, though stdout/stderr could be useful. */ |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
235 devnull = open(_PATH_DEVNULL, O_RDONLY); |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
236 if (devnull < 0) { |
|
594
a98a2138364a
Improve capitalisation for all logged strings
Matt Johnston <matt@ucc.asn.au>
parents:
568
diff
changeset
|
237 dropbear_exit("Opening /dev/null: %d %s", |
|
326
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
238 errno, strerror(errno)); |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
239 } |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
240 dup2(devnull, STDIN_FILENO); |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
241 if (daemon(0, 1) < 0) { |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
242 dropbear_exit("Backgrounding failed: %d %s", |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
243 errno, strerror(errno)); |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
244 } |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
245 } |
|
d965110e3f5c
add -f background option to dbclient
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
246 |
| 64 | 247 #ifdef ENABLE_CLI_LOCALTCPFWD |
|
485
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
248 setup_localtcp(); |
| 64 | 249 #endif |
|
65
02e4a7f614f8
Oops, forgot to call the actual code.
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
250 #ifdef ENABLE_CLI_REMOTETCPFWD |
|
485
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
251 setup_remotetcp(); |
|
65
02e4a7f614f8
Oops, forgot to call the actual code.
Matt Johnston <matt@ucc.asn.au>
parents:
64
diff
changeset
|
252 #endif |
|
485
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
253 |
|
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
254 #ifdef ENABLE_CLI_NETCAT |
|
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
255 if (cli_opts.netcat_host) { |
|
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
256 cli_send_netcat_request(); |
|
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
257 } else |
|
12d845ab7b5f
Rework netcat-alike to be a proper mode, with -B argument.
Matt Johnston <matt@ucc.asn.au>
parents:
478
diff
changeset
|
258 #endif |
| 560 | 259 if (!cli_opts.no_cmd) { |
|
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
272
diff
changeset
|
260 cli_send_chansess_request(); |
|
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
272
diff
changeset
|
261 } |
|
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
272
diff
changeset
|
262 TRACE(("leave cli_sessionloop: running")) |
| 37 | 263 cli_ses.state = SESSION_RUNNING; |
| 264 return; | |
| 265 | |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
266 case SESSION_RUNNING: |
|
325
0e4f225b7e07
Add -N "no remote command" dbclient option.
Matt Johnston <matt@ucc.asn.au>
parents:
272
diff
changeset
|
267 if (ses.chancount < 1 && !cli_opts.no_cmd) { |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
268 cli_finished(); |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
269 } |
|
41
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
270 |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
271 if (cli_ses.winchange) { |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
272 cli_chansess_winchange(); |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
273 } |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
274 return; |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
275 |
| 33 | 276 /* XXX more here needed */ |
| 277 | |
| 278 | |
| 279 default: | |
| 280 break; | |
| 26 | 281 } |
| 282 | |
|
165
0cfba3034be5
Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place
Matt Johnston <matt@ucc.asn.au>
parents:
136
diff
changeset
|
283 TRACE(("leave cli_sessionloop: fell out")) |
| 26 | 284 |
| 285 } | |
| 286 | |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
287 void cli_session_cleanup() { |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
288 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
289 if (!sessinitdone) { |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
290 return; |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
291 } |
|
99
0247fbd9379d
Move the revert-to-non-blocking-stdin code to cli-session so it
Matt Johnston <matt@ucc.asn.au>
parents:
74
diff
changeset
|
292 |
|
175
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
293 /* Set std{in,out,err} back to non-blocking - busybox ash dies nastily if |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
294 * we don't revert the flags */ |
|
100
c72f5c10125d
oops, the fcntl() was commented out
Matt Johnston <matt@ucc.asn.au>
parents:
99
diff
changeset
|
295 fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags); |
|
175
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
296 fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags); |
|
2c5741e4b855
* Reset the non-blocking status of stdout and stderr as well on exit
Matt Johnston <matt@ucc.asn.au>
parents:
165
diff
changeset
|
297 fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags); |
|
99
0247fbd9379d
Move the revert-to-non-blocking-stdin code to cli-session so it
Matt Johnston <matt@ucc.asn.au>
parents:
74
diff
changeset
|
298 |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
299 cli_tty_cleanup(); |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
300 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
301 } |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
302 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
303 static void cli_finished() { |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
304 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
305 cli_session_cleanup(); |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
306 common_session_cleanup(); |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
307 fprintf(stderr, "Connection to %s@%s:%s closed.\n", cli_opts.username, |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
308 cli_opts.remotehost, cli_opts.remoteport); |
|
108
10f4d3319780
- added circular buffering for channels
Matt Johnston <matt@ucc.asn.au>
parents:
107
diff
changeset
|
309 exit(cli_ses.retval); |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
310 } |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
311 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
312 |
| 26 | 313 /* called when the remote side closes the connection */ |
| 314 static void cli_remoteclosed() { | |
| 315 | |
| 316 /* XXX TODO perhaps print a friendlier message if we get this but have | |
| 317 * already sent/received disconnect message(s) ??? */ | |
|
479
e3db1f7a2e43
- Split main socket var into ses.sock_in/ses.sock_out in preparation
Matt Johnston <matt@ucc.asn.au>
parents:
433
diff
changeset
|
318 m_close(ses.sock_in); |
|
e3db1f7a2e43
- Split main socket var into ses.sock_in/ses.sock_out in preparation
Matt Johnston <matt@ucc.asn.au>
parents:
433
diff
changeset
|
319 m_close(ses.sock_out); |
|
e3db1f7a2e43
- Split main socket var into ses.sock_in/ses.sock_out in preparation
Matt Johnston <matt@ucc.asn.au>
parents:
433
diff
changeset
|
320 ses.sock_in = -1; |
|
e3db1f7a2e43
- Split main socket var into ses.sock_in/ses.sock_out in preparation
Matt Johnston <matt@ucc.asn.au>
parents:
433
diff
changeset
|
321 ses.sock_out = -1; |
|
594
a98a2138364a
Improve capitalisation for all logged strings
Matt Johnston <matt@ucc.asn.au>
parents:
568
diff
changeset
|
322 dropbear_exit("Remote closed the connection"); |
| 26 | 323 } |
| 43 | 324 |
| 325 /* Operates in-place turning dirty (untrusted potentially containing control | |
|
249
efbaf6b03837
added keyboard-interactive client support
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
326 * characters) text into clean text. |
|
efbaf6b03837
added keyboard-interactive client support
Matt Johnston <matt@ucc.asn.au>
parents:
215
diff
changeset
|
327 * Note: this is safe only with ascii - other charsets could have problems. */ |
| 43 | 328 void cleantext(unsigned char* dirtytext) { |
| 329 | |
| 330 unsigned int i, j; | |
| 47 | 331 unsigned char c; |
| 43 | 332 |
| 333 j = 0; | |
| 334 for (i = 0; dirtytext[i] != '\0'; i++) { | |
| 335 | |
| 336 c = dirtytext[i]; | |
| 337 /* We can ignore '\r's */ | |
| 338 if ( (c >= ' ' && c <= '~') || c == '\n' || c == '\t') { | |
| 339 dirtytext[j] = c; | |
| 340 j++; | |
| 341 } | |
| 342 } | |
| 343 /* Null terminate */ | |
| 344 dirtytext[j] = '\0'; | |
| 345 } |