dropbear: cli-session.c annotate

annotate cli-session.c @ 686:983a817f8e41 insecure-nocrypto

- Only request "none" cipher after auth has succeeded

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 17 May 2012 20:52:57 +0800
parents	a98a2138364a
children	78eda530c000 d44325108d0e d1575fdc29a6

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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "session.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "dbutil.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "kex.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "ssh.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "packet.h"
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	32 #include "tcpfwd.h"
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "channel.h"
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "random.h"
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 static void cli_remoteclosed();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 static void cli_sessionloop();
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 struct clientsession cli_ses; /* GLOBAL */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 {SSH_MSG_CHANNEL_DATA, recv_msg_channel_data},
107 d3eb1fa8484e Nasty. Matt Johnston <matt@ucc.asn.au> parents: 100 diff changeset	52 {SSH_MSG_CHANNEL_EXTENDED_DATA, recv_msg_channel_extended_data},
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 {SSH_MSG_CHANNEL_REQUEST, recv_msg_channel_request},
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open},
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof},
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close},
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation},
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 {0, 0} /* End */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 };
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 static const struct ChanType *cli_chantypes[] = {
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	76 #ifdef ENABLE_CLI_REMOTETCPFWD
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	77 &cli_chan_tcpremote,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 NULL /* Null termination */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 };
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	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 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 chaninitialise(cli_chantypes);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	95 /* Set up cli_ses vars */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	96 cli_session_init();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 /* Ready to go */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 sessinitdone = 1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 /* Exchange identification */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 session_identification();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 send_msg_kexinit();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 session_loop(cli_sessionloop);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 /* Not reached */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	110 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	112 static void cli_session_init() {
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	113
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	114 cli_ses.state = STATE_NOTHING;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	115 cli_ses.kex_state = KEX_NOTHING;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	116
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: 37 diff changeset	117 cli_ses.tty_raw_mode = 0;
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	118 cli_ses.winchange = 0;
39 0883c0906870 tty raw mode support works mostly Matt Johnston <matt@ucc.asn.au> parents: 37 diff changeset	119
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	120 /* 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	121 * (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	122 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	123 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	124 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	125 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	126 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	127 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	128
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	129 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	130 specific exit status */
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	131
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	132 /* Auth */
215 aad4b3f58556 rename PubkeyList to SignKeyList for clarity Matt Johnston <matt@ucc.asn.au> parents: 175 diff changeset	133 cli_ses.lastprivkey = NULL;
136 fb7147e2fb04 - Fixed a couple of compile warnings Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	134 cli_ses.lastauthtype = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	135
686 983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	136 #ifdef DROPBEAR_NONE_CIPHER
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	137 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	138 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	139 #else
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	140 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	141 #endif
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	142
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	143 /* For printing "remote host closed" for the user */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	144 ses.remoteclosed = cli_remoteclosed;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	145 ses.buf_match_algo = cli_buf_match_algo;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	146
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	147 /* packet handlers */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	148 ses.packettypes = cli_packettypes;
35 0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	149
0ad5fb979f42 set the isserver flag (oops) Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	150 ses.isserver = 0;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	153 /* This function drives the progress of the session - it initiates KEX,
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	154 * service, userauth and channel requests */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 static void cli_sessionloop() {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156
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	157 TRACE(("enter cli_sessionloop"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	158
34 e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	159 if (ses.lastpacket == SSH_MSG_KEXINIT && cli_ses.kex_state == KEX_NOTHING) {
e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	160 cli_ses.kex_state = KEXINIT_RCVD;
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	161 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	162
34 e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	163 if (cli_ses.kex_state == KEXINIT_RCVD) {
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	164
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	165 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	166 * negotiation would have failed. */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	167 send_msg_kexdh_init();
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	168 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	169 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	170 return;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	171 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	172
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	173 /* A KEX has finished, so we should go back to our KEX_NOTHING state */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	174 if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	175 && ses.kexstate.sentkexinit == 0) {
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	176 cli_ses.kex_state = KEX_NOTHING;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	177 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	178
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	179 /* We shouldn't do anything else if a KEX is in progress */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	180 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	181 TRACE(("leave cli_sessionloop: kex_state != KEX_NOTHING"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	182 return;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	183 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	184
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	185 /* We should exit if we haven't donefirstkex: we shouldn't reach here
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	186 * in normal operation */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	187 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	188 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	189 return;
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	190 }
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	191
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 switch (cli_ses.state) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	194 case STATE_NOTHING:
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	195 /* We've got the transport layer sorted, we now need to request
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	196 * userauth */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	197 send_msg_service_request(SSH_SERVICE_USERAUTH);
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	198 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	199 TRACE(("leave cli_sessionloop: sent userauth service req"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	200 return;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	202 /* userauth code */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	203 case SERVICE_AUTH_ACCEPT_RCVD:
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	204 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	205 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	206 TRACE(("leave cli_sessionloop: sent userauth methods req"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	207 return;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	208
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	209 case USERAUTH_FAIL_RCVD:
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	210 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	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: cli_auth_try"))
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	213 return;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	214
37 0913e2ee3545 we're nearly there yet Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	215 case USERAUTH_SUCCESS_RCVD:
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	216
686 983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	217 #ifdef DROPBEAR_NONE_CIPHER
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	218 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	219 {
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	220 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	221 send_msg_kexinit();
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	222 }
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	223 #endif
983a817f8e41 - Only request "none" cipher after auth has succeeded Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	224
326 d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	225 if (cli_opts.backgrounded) {
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	226 int devnull;
433 c216212001fc Fix for -pedantic -ansi compilation, change // to /*/, plus some signedness Matt Johnston <matt@ucc.asn.au>* parents: 326 diff changeset	227 /* 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	228 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	229 devnull = open(_PATH_DEVNULL, O_RDONLY);
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	230 if (devnull < 0) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	231 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	232 errno, strerror(errno));
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	233 }
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	234 dup2(devnull, STDIN_FILENO);
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	235 if (daemon(0, 1) < 0) {
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	236 dropbear_exit("Backgrounding failed: %d %s",
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	237 errno, strerror(errno));
d965110e3f5c add -f background option to dbclient Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	238 }
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
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	241 #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	242 setup_localtcp();
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	243 #endif
65 02e4a7f614f8 Oops, forgot to call the actual code. Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	244 #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	245 setup_remotetcp();
65 02e4a7f614f8 Oops, forgot to call the actual code. Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	246 #endif
485 12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	247
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	248 #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	249 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	250 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	251 } else
12d845ab7b5f Rework netcat-alike to be a proper mode, with -B argument. Matt Johnston <matt@ucc.asn.au> parents: 478 diff changeset	252 #endif
560 52d7301e46bd Agent forwarding works Matt Johnston <matt@ucc.asn.au> parents: 547 diff changeset	253 if (!cli_opts.no_cmd) {
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	254 cli_send_chansess_request();
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	255 }
0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	256 TRACE(("leave cli_sessionloop: running"))
37 0913e2ee3545 we're nearly there yet Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	257 cli_ses.state = SESSION_RUNNING;
0913e2ee3545 we're nearly there yet Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	258 return;
0913e2ee3545 we're nearly there yet Matt Johnston <matt@ucc.asn.au> parents: 35 diff changeset	259
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	260 case SESSION_RUNNING:
325 0e4f225b7e07 Add -N "no remote command" dbclient option. Matt Johnston <matt@ucc.asn.au> parents: 272 diff changeset	261 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	262 cli_finished();
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	263 }
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	264
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	265 if (cli_ses.winchange) {
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	266 cli_chansess_winchange();
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	267 }
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	268 return;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	269
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	270 /* XXX more here needed */
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	271
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	272
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	273 default:
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	274 break;
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276
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	277 TRACE(("leave cli_sessionloop: fell out"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	281 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	282
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	283 if (!sessinitdone) {
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	284 return;
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	285 }
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	286
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	287 /* 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	288 * we don't revert the flags */
100 c72f5c10125d oops, the fcntl() was commented out Matt Johnston <matt@ucc.asn.au> parents: 99 diff changeset	289 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	290 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	291 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	292
40 b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	293 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	294
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	295 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	296
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	297 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	298
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	299 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	300 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	301 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	302 cli_opts.remotehost, cli_opts.remoteport);
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	303 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	304 }
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	305
b4874d772210 - Added terminal mode handling etc for the client, and window change Matt Johnston <matt@ucc.asn.au> parents: 39 diff changeset	306
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 /* called when the remote side closes the connection */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 static void cli_remoteclosed() {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 /* XXX TODO perhaps print a friendlier message if we get this but have
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 * 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	312 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	313 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	314 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	315 ses.sock_out = -1;
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	316 dropbear_exit("Remote closed the connection");
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 }
43 942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	318
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	319 /* 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	320 * characters) text into clean text.
efbaf6b03837 added keyboard-interactive client support Matt Johnston <matt@ucc.asn.au> parents: 215 diff changeset	321 * Note: this is safe only with ascii - other charsets could have problems. */
43 942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	322 void cleantext(unsigned char* dirtytext) {
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	323
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	324 unsigned int i, j;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	325 unsigned char c;
43 942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	326
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	327 j = 0;
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	328 for (i = 0; dirtytext[i] != '\0'; i++) {
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	329
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	330 c = dirtytext[i];
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	331 /* We can ignore '\r's */
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	332 if ( (c >= ' ' && c <= '~') \|\| c == '\n' \|\| c == '\t') {
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	333 dirtytext[j] = c;
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	334 j++;
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	335 }
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	336 }
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	337 /* Null terminate */
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	338 dirtytext[j] = '\0';
942b22d7dd1c Banner printing Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	339 }

Mercurial > dropbear

annotate cli-session.c @ 686:983a817f8e41 insecure-nocrypto