Mercurial > dropbear
annotate cli-session.c @ 40:b4874d772210
- Added terminal mode handling etc for the client, and window change
- Refactored the terminal-mode handling for the server
- Improved session closing for the client
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 01 Aug 2004 08:54:01 +0000 |
parents | 0883c0906870 |
children | 18eccbfb9641 |
rev | line source |
---|---|
26 | 1 #include "includes.h" |
2 #include "session.h" | |
3 #include "dbutil.h" | |
4 #include "kex.h" | |
5 #include "ssh.h" | |
6 #include "packet.h" | |
7 #include "tcpfwd-direct.h" | |
8 #include "tcpfwd-remote.h" | |
9 #include "channel.h" | |
10 #include "random.h" | |
33 | 11 #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
|
12 #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
|
13 #include "chansession.h" |
26 | 14 |
15 static void cli_remoteclosed(); | |
16 static void cli_sessionloop(); | |
33 | 17 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
|
18 static void cli_finished(); |
26 | 19 |
20 struct clientsession cli_ses; /* GLOBAL */ | |
21 | |
22 static const packettype cli_packettypes[] = { | |
23 /* TYPE, AUTHREQUIRED, FUNCTION */ | |
24 {SSH_MSG_KEXINIT, recv_msg_kexinit}, | |
25 {SSH_MSG_KEXDH_REPLY, recv_msg_kexdh_reply}, // client | |
26 {SSH_MSG_NEWKEYS, recv_msg_newkeys}, | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
27 {SSH_MSG_SERVICE_ACCEPT, recv_msg_service_accept}, // client |
26 | 28 {SSH_MSG_CHANNEL_DATA, recv_msg_channel_data}, |
29 {SSH_MSG_CHANNEL_WINDOW_ADJUST, recv_msg_channel_window_adjust}, | |
30 {SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_remotetcp}, | |
31 {SSH_MSG_CHANNEL_REQUEST, recv_msg_channel_request}, | |
32 {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open}, | |
33 {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof}, | |
34 {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close}, | |
35 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation}, | |
36 {SSH_MSG_CHANNEL_OPEN_FAILURE, recv_msg_channel_open_failure}, | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
37 {SSH_MSG_USERAUTH_FAILURE, recv_msg_userauth_failure}, // client |
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
38 {SSH_MSG_USERAUTH_SUCCESS, recv_msg_userauth_success}, // client |
26 | 39 {0, 0} /* End */ |
40 }; | |
41 | |
42 static const struct ChanType *cli_chantypes[] = { | |
43 /* &chan_tcpdirect etc, though need to only allow if we've requested | |
44 * that forwarding */ | |
45 NULL /* Null termination */ | |
46 }; | |
33 | 47 |
26 | 48 void cli_session(int sock, char* remotehost) { |
49 | |
50 crypto_init(); | |
51 common_session_init(sock, remotehost); | |
52 | |
53 chaninitialise(cli_chantypes); | |
54 | |
55 | |
33 | 56 /* Set up cli_ses vars */ |
57 cli_session_init(); | |
26 | 58 |
59 /* Ready to go */ | |
60 sessinitdone = 1; | |
61 | |
62 /* Exchange identification */ | |
63 session_identification(); | |
64 | |
65 seedrandom(); | |
66 | |
67 send_msg_kexinit(); | |
68 | |
69 /* XXX here we do stuff differently */ | |
70 | |
71 session_loop(cli_sessionloop); | |
72 | |
73 /* Not reached */ | |
74 | |
33 | 75 } |
26 | 76 |
33 | 77 static void cli_session_init() { |
78 | |
79 cli_ses.state = STATE_NOTHING; | |
80 cli_ses.kex_state = KEX_NOTHING; | |
81 | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
82 cli_ses.tty_raw_mode = 0; |
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
83 |
33 | 84 /* For printing "remote host closed" for the user */ |
85 ses.remoteclosed = cli_remoteclosed; | |
86 ses.buf_match_algo = cli_buf_match_algo; | |
87 | |
88 /* packet handlers */ | |
89 ses.packettypes = cli_packettypes; | |
35
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
90 |
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
91 ses.isserver = 0; |
26 | 92 } |
93 | |
33 | 94 /* This function drives the progress of the session - it initiates KEX, |
95 * service, userauth and channel requests */ | |
26 | 96 static void cli_sessionloop() { |
97 | |
33 | 98 TRACE(("enter cli_sessionloop")); |
99 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
100 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
|
101 cli_ses.kex_state = KEXINIT_RCVD; |
33 | 102 } |
103 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
104 if (cli_ses.kex_state == KEXINIT_RCVD) { |
33 | 105 |
106 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT | |
107 * negotiation would have failed. */ | |
108 send_msg_kexdh_init(); | |
109 cli_ses.kex_state = KEXDH_INIT_SENT; | |
110 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD")); | |
111 return; | |
112 } | |
113 | |
114 /* A KEX has finished, so we should go back to our KEX_NOTHING state */ | |
115 if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0 | |
116 && ses.kexstate.sentkexinit == 0) { | |
117 cli_ses.kex_state = KEX_NOTHING; | |
118 } | |
119 | |
120 /* We shouldn't do anything else if a KEX is in progress */ | |
121 if (cli_ses.kex_state != KEX_NOTHING) { | |
122 TRACE(("leave cli_sessionloop: kex_state != KEX_NOTHING")); | |
123 return; | |
124 } | |
125 | |
126 /* We should exit if we haven't donefirstkex: we shouldn't reach here | |
127 * in normal operation */ | |
128 if (ses.kexstate.donefirstkex == 0) { | |
129 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
|
130 return; |
33 | 131 } |
132 | |
26 | 133 switch (cli_ses.state) { |
134 | |
33 | 135 case STATE_NOTHING: |
136 /* We've got the transport layer sorted, we now need to request | |
137 * userauth */ | |
138 send_msg_service_request(SSH_SERVICE_USERAUTH); | |
139 cli_ses.state = SERVICE_AUTH_REQ_SENT; | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
140 TRACE(("leave cli_sessionloop: sent userauth service req")); |
33 | 141 return; |
26 | 142 |
33 | 143 /* userauth code */ |
144 case SERVICE_AUTH_ACCEPT_RCVD: | |
145 cli_auth_getmethods(); | |
146 cli_ses.state = USERAUTH_METHODS_SENT; | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
147 TRACE(("leave cli_sessionloop: sent userauth methods req")); |
33 | 148 return; |
149 | |
150 case USERAUTH_FAIL_RCVD: | |
151 cli_auth_try(); | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
152 TRACE(("leave cli_sessionloop: cli_auth_try")); |
33 | 153 return; |
154 | |
37 | 155 /* |
156 case USERAUTH_SUCCESS_RCVD: | |
157 send_msg_service_request(SSH_SERVICE_CONNECTION); | |
158 cli_ses.state = SERVICE_CONN_REQ_SENT; | |
159 TRACE(("leave cli_sessionloop: sent ssh-connection service req")); | |
160 return; | |
161 */ | |
162 | |
163 case USERAUTH_SUCCESS_RCVD: | |
164 cli_send_chansess_request(); | |
165 TRACE(("leave cli_sessionloop: cli_send_chansess_request")); | |
166 cli_ses.state = SESSION_RUNNING; | |
167 return; | |
168 | |
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
169 case SESSION_RUNNING: |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
170 if (ses.chancount < 1) { |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
171 cli_finished(); |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
172 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
173 return; |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
174 |
33 | 175 /* XXX more here needed */ |
176 | |
177 | |
178 default: | |
179 break; | |
26 | 180 } |
181 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
182 TRACE(("leave cli_sessionloop: fell out")); |
26 | 183 |
184 } | |
185 | |
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
186 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
|
187 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
188 if (!sessinitdone) { |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
189 return; |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
190 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
191 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
|
192 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
193 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
194 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
195 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
|
196 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
197 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
|
198 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
|
199 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
|
200 cli_opts.remotehost, cli_opts.remoteport); |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
201 exit(EXIT_SUCCESS); |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
202 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
203 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
204 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
205 |
26 | 206 /* called when the remote side closes the connection */ |
207 static void cli_remoteclosed() { | |
208 | |
209 /* XXX TODO perhaps print a friendlier message if we get this but have | |
210 * already sent/received disconnect message(s) ??? */ | |
211 close(ses.sock); | |
212 ses.sock = -1; | |
33 | 213 dropbear_exit("remote closed the connection"); |
26 | 214 } |