Mercurial > dropbear
annotate cli-session.c @ 55:0a88488a949a
add cli-authpubkey
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 08 Aug 2004 16:55:03 +0000 |
parents | 4b53a43f0082 |
children | 20563735e8b5 |
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 | |
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
22 /* 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
|
23 * should be first */ |
26 | 24 static const packettype cli_packettypes[] = { |
25 /* TYPE, AUTHREQUIRED, FUNCTION */ | |
26 {SSH_MSG_CHANNEL_DATA, recv_msg_channel_data}, | |
27 {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
|
28 {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
|
29 {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
|
30 {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
|
31 {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
|
32 {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
|
33 {SSH_MSG_SERVICE_ACCEPT, recv_msg_service_accept}, /* client */ |
26 | 34 {SSH_MSG_GLOBAL_REQUEST, recv_msg_global_request_remotetcp}, |
35 {SSH_MSG_CHANNEL_REQUEST, recv_msg_channel_request}, | |
36 {SSH_MSG_CHANNEL_OPEN, recv_msg_channel_open}, | |
37 {SSH_MSG_CHANNEL_EOF, recv_msg_channel_eof}, | |
38 {SSH_MSG_CHANNEL_CLOSE, recv_msg_channel_close}, | |
39 {SSH_MSG_CHANNEL_OPEN_CONFIRMATION, recv_msg_channel_open_confirmation}, | |
40 {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
|
41 {SSH_MSG_USERAUTH_BANNER, recv_msg_userauth_banner}, /* client */ |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
42 #ifdef DROPBEAR_PUBKEY_AUTH |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
43 {SSH_MSG_USERAUTH_PK_OK, recv_msg_userauth_pk_ok}, /* client */ |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
44 #endif |
26 | 45 {0, 0} /* End */ |
46 }; | |
47 | |
48 static const struct ChanType *cli_chantypes[] = { | |
49 /* &chan_tcpdirect etc, though need to only allow if we've requested | |
50 * that forwarding */ | |
51 NULL /* Null termination */ | |
52 }; | |
33 | 53 |
26 | 54 void cli_session(int sock, char* remotehost) { |
55 | |
56 crypto_init(); | |
57 common_session_init(sock, remotehost); | |
58 | |
59 chaninitialise(cli_chantypes); | |
60 | |
61 | |
33 | 62 /* Set up cli_ses vars */ |
63 cli_session_init(); | |
26 | 64 |
65 /* Ready to go */ | |
66 sessinitdone = 1; | |
67 | |
68 /* Exchange identification */ | |
69 session_identification(); | |
70 | |
71 seedrandom(); | |
72 | |
73 send_msg_kexinit(); | |
74 | |
75 /* XXX here we do stuff differently */ | |
76 | |
77 session_loop(cli_sessionloop); | |
78 | |
79 /* Not reached */ | |
80 | |
33 | 81 } |
26 | 82 |
33 | 83 static void cli_session_init() { |
84 | |
85 cli_ses.state = STATE_NOTHING; | |
86 cli_ses.kex_state = KEX_NOTHING; | |
87 | |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
88 cli_ses.tty_raw_mode = 0; |
41
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
89 cli_ses.winchange = 0; |
39
0883c0906870
tty raw mode support works mostly
Matt Johnston <matt@ucc.asn.au>
parents:
37
diff
changeset
|
90 |
47 | 91 /* Auth */ |
92 cli_ses.lastpubkey = NULL; | |
93 cli_ses.lastauthtype = NULL; | |
94 | |
33 | 95 /* For printing "remote host closed" for the user */ |
96 ses.remoteclosed = cli_remoteclosed; | |
97 ses.buf_match_algo = cli_buf_match_algo; | |
98 | |
99 /* packet handlers */ | |
100 ses.packettypes = cli_packettypes; | |
35
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
101 |
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
102 ses.isserver = 0; |
26 | 103 } |
104 | |
33 | 105 /* This function drives the progress of the session - it initiates KEX, |
106 * service, userauth and channel requests */ | |
26 | 107 static void cli_sessionloop() { |
108 | |
33 | 109 TRACE(("enter cli_sessionloop")); |
110 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
111 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
|
112 cli_ses.kex_state = KEXINIT_RCVD; |
33 | 113 } |
114 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
115 if (cli_ses.kex_state == KEXINIT_RCVD) { |
33 | 116 |
117 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT | |
118 * negotiation would have failed. */ | |
119 send_msg_kexdh_init(); | |
120 cli_ses.kex_state = KEXDH_INIT_SENT; | |
121 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD")); | |
122 return; | |
123 } | |
124 | |
125 /* A KEX has finished, so we should go back to our KEX_NOTHING state */ | |
126 if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0 | |
127 && ses.kexstate.sentkexinit == 0) { | |
128 cli_ses.kex_state = KEX_NOTHING; | |
129 } | |
130 | |
131 /* We shouldn't do anything else if a KEX is in progress */ | |
132 if (cli_ses.kex_state != KEX_NOTHING) { | |
133 TRACE(("leave cli_sessionloop: kex_state != KEX_NOTHING")); | |
134 return; | |
135 } | |
136 | |
137 /* We should exit if we haven't donefirstkex: we shouldn't reach here | |
138 * in normal operation */ | |
139 if (ses.kexstate.donefirstkex == 0) { | |
140 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
|
141 return; |
33 | 142 } |
143 | |
26 | 144 switch (cli_ses.state) { |
145 | |
33 | 146 case STATE_NOTHING: |
147 /* We've got the transport layer sorted, we now need to request | |
148 * userauth */ | |
149 send_msg_service_request(SSH_SERVICE_USERAUTH); | |
150 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
|
151 TRACE(("leave cli_sessionloop: sent userauth service req")); |
33 | 152 return; |
26 | 153 |
33 | 154 /* userauth code */ |
155 case SERVICE_AUTH_ACCEPT_RCVD: | |
156 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
|
157 cli_ses.state = USERAUTH_REQ_SENT; |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
158 TRACE(("leave cli_sessionloop: sent userauth methods req")); |
33 | 159 return; |
160 | |
161 case USERAUTH_FAIL_RCVD: | |
162 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
|
163 cli_ses.state = USERAUTH_REQ_SENT; |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
164 TRACE(("leave cli_sessionloop: cli_auth_try")); |
33 | 165 return; |
166 | |
47 | 167 /* |
37 | 168 case USERAUTH_SUCCESS_RCVD: |
169 send_msg_service_request(SSH_SERVICE_CONNECTION); | |
170 cli_ses.state = SERVICE_CONN_REQ_SENT; | |
171 TRACE(("leave cli_sessionloop: sent ssh-connection service req")); | |
172 return; | |
173 | |
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
174 case SERVICE_CONN_ACCEPT_RCVD: |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
175 cli_send_chansess_request(); |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
176 TRACE(("leave cli_sessionloop: cli_send_chansess_request")); |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
177 cli_ses.state = SESSION_RUNNING; |
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
178 return; |
47 | 179 */ |
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
180 |
37 | 181 case USERAUTH_SUCCESS_RCVD: |
182 cli_send_chansess_request(); | |
183 TRACE(("leave cli_sessionloop: cli_send_chansess_request")); | |
184 cli_ses.state = SESSION_RUNNING; | |
185 return; | |
186 | |
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
187 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
|
188 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
|
189 cli_finished(); |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
190 } |
41
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
191 |
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
192 if (cli_ses.winchange) { |
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
193 cli_chansess_winchange(); |
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
194 } |
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
195 return; |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
196 |
33 | 197 /* XXX more here needed */ |
198 | |
199 | |
200 default: | |
201 break; | |
26 | 202 } |
203 | |
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
204 TRACE(("leave cli_sessionloop: fell out")); |
26 | 205 |
206 } | |
207 | |
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
208 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
|
209 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
210 if (!sessinitdone) { |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
211 return; |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
212 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
213 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
|
214 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
215 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
216 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
217 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
|
218 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
219 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
|
220 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
|
221 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
|
222 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
|
223 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
|
224 } |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
225 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
226 |
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
227 |
26 | 228 /* called when the remote side closes the connection */ |
229 static void cli_remoteclosed() { | |
230 | |
231 /* XXX TODO perhaps print a friendlier message if we get this but have | |
232 * already sent/received disconnect message(s) ??? */ | |
233 close(ses.sock); | |
234 ses.sock = -1; | |
33 | 235 dropbear_exit("remote closed the connection"); |
26 | 236 } |
43 | 237 |
238 /* Operates in-place turning dirty (untrusted potentially containing control | |
239 * characters) text into clean text. */ | |
240 void cleantext(unsigned char* dirtytext) { | |
241 | |
242 unsigned int i, j; | |
47 | 243 unsigned char c; |
43 | 244 |
245 j = 0; | |
246 for (i = 0; dirtytext[i] != '\0'; i++) { | |
247 | |
248 c = dirtytext[i]; | |
249 /* We can ignore '\r's */ | |
250 if ( (c >= ' ' && c <= '~') || c == '\n' || c == '\t') { | |
251 dirtytext[j] = c; | |
252 j++; | |
253 } | |
254 } | |
255 /* Null terminate */ | |
256 dirtytext[j] = '\0'; | |
257 } |