Mercurial > dropbear
annotate cli-session.c @ 45:9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
remote hostkey verification though.
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 03 Aug 2004 17:26:56 +0000 |
| parents | 942b22d7dd1c |
| children | 4b53a43f0082 |
| 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 |
| 33 | 91 /* For printing "remote host closed" for the user */ |
| 92 ses.remoteclosed = cli_remoteclosed; | |
| 93 ses.buf_match_algo = cli_buf_match_algo; | |
| 94 | |
| 95 /* packet handlers */ | |
| 96 ses.packettypes = cli_packettypes; | |
|
35
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
97 |
|
0ad5fb979f42
set the isserver flag (oops)
Matt Johnston <matt@ucc.asn.au>
parents:
34
diff
changeset
|
98 ses.isserver = 0; |
| 26 | 99 } |
| 100 | |
| 33 | 101 /* This function drives the progress of the session - it initiates KEX, |
| 102 * service, userauth and channel requests */ | |
| 26 | 103 static void cli_sessionloop() { |
| 104 | |
| 33 | 105 TRACE(("enter cli_sessionloop")); |
| 106 | |
|
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
107 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
|
108 cli_ses.kex_state = KEXINIT_RCVD; |
| 33 | 109 } |
| 110 | |
|
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
111 if (cli_ses.kex_state == KEXINIT_RCVD) { |
| 33 | 112 |
| 113 /* We initiate the KEXDH. If DH wasn't the correct type, the KEXINIT | |
| 114 * negotiation would have failed. */ | |
| 115 send_msg_kexdh_init(); | |
| 116 cli_ses.kex_state = KEXDH_INIT_SENT; | |
| 117 TRACE(("leave cli_sessionloop: done with KEXINIT_RCVD")); | |
| 118 return; | |
| 119 } | |
| 120 | |
| 121 /* A KEX has finished, so we should go back to our KEX_NOTHING state */ | |
| 122 if (cli_ses.kex_state != KEX_NOTHING && ses.kexstate.recvkexinit == 0 | |
| 123 && ses.kexstate.sentkexinit == 0) { | |
| 124 cli_ses.kex_state = KEX_NOTHING; | |
| 125 } | |
| 126 | |
| 127 /* We shouldn't do anything else if a KEX is in progress */ | |
| 128 if (cli_ses.kex_state != KEX_NOTHING) { | |
| 129 TRACE(("leave cli_sessionloop: kex_state != KEX_NOTHING")); | |
| 130 return; | |
| 131 } | |
| 132 | |
| 133 /* We should exit if we haven't donefirstkex: we shouldn't reach here | |
| 134 * in normal operation */ | |
| 135 if (ses.kexstate.donefirstkex == 0) { | |
| 136 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
|
137 return; |
| 33 | 138 } |
| 139 | |
| 26 | 140 switch (cli_ses.state) { |
| 141 | |
| 33 | 142 case STATE_NOTHING: |
| 143 /* We've got the transport layer sorted, we now need to request | |
| 144 * userauth */ | |
| 145 send_msg_service_request(SSH_SERVICE_USERAUTH); | |
| 146 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
|
147 TRACE(("leave cli_sessionloop: sent userauth service req")); |
| 33 | 148 return; |
| 26 | 149 |
| 33 | 150 /* userauth code */ |
| 151 case SERVICE_AUTH_ACCEPT_RCVD: | |
| 152 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
|
153 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
|
154 TRACE(("leave cli_sessionloop: sent userauth methods req")); |
| 33 | 155 return; |
| 156 | |
| 157 case USERAUTH_FAIL_RCVD: | |
| 158 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
|
159 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
|
160 TRACE(("leave cli_sessionloop: cli_auth_try")); |
| 33 | 161 return; |
| 162 | |
| 37 | 163 case USERAUTH_SUCCESS_RCVD: |
| 164 send_msg_service_request(SSH_SERVICE_CONNECTION); | |
| 165 cli_ses.state = SERVICE_CONN_REQ_SENT; | |
| 166 TRACE(("leave cli_sessionloop: sent ssh-connection service req")); | |
| 167 return; | |
| 168 | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
169 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
|
170 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
|
171 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
|
172 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
|
173 return; |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
174 |
|
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
175 /* |
| 37 | 176 case USERAUTH_SUCCESS_RCVD: |
| 177 cli_send_chansess_request(); | |
| 178 TRACE(("leave cli_sessionloop: cli_send_chansess_request")); | |
| 179 cli_ses.state = SESSION_RUNNING; | |
| 180 return; | |
|
45
9ee8996a375f
Pubkey auth is mostly there for the client. Something strange with
Matt Johnston <matt@ucc.asn.au>
parents:
43
diff
changeset
|
181 */ |
| 37 | 182 |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
183 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
|
184 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
|
185 cli_finished(); |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
186 } |
|
41
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
187 |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
188 if (cli_ses.winchange) { |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
189 cli_chansess_winchange(); |
|
18eccbfb9641
added window-size change handling
Matt Johnston <matt@ucc.asn.au>
parents:
40
diff
changeset
|
190 } |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
191 return; |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
192 |
| 33 | 193 /* XXX more here needed */ |
| 194 | |
| 195 | |
| 196 default: | |
| 197 break; | |
| 26 | 198 } |
| 199 | |
|
34
e2a1eaa19f22
Client mostly works up to password auth
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
200 TRACE(("leave cli_sessionloop: fell out")); |
| 26 | 201 |
| 202 } | |
| 203 | |
|
40
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
204 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
|
205 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
206 if (!sessinitdone) { |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
207 return; |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
208 } |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
209 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
|
210 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
211 } |
|
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 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
|
214 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
215 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
|
216 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
|
217 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
|
218 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
|
219 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
|
220 } |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
221 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
222 |
|
b4874d772210
- Added terminal mode handling etc for the client, and window change
Matt Johnston <matt@ucc.asn.au>
parents:
39
diff
changeset
|
223 |
| 26 | 224 /* called when the remote side closes the connection */ |
| 225 static void cli_remoteclosed() { | |
| 226 | |
| 227 /* XXX TODO perhaps print a friendlier message if we get this but have | |
| 228 * already sent/received disconnect message(s) ??? */ | |
| 229 close(ses.sock); | |
| 230 ses.sock = -1; | |
| 33 | 231 dropbear_exit("remote closed the connection"); |
| 26 | 232 } |
| 43 | 233 |
| 234 /* Operates in-place turning dirty (untrusted potentially containing control | |
| 235 * characters) text into clean text. */ | |
| 236 void cleantext(unsigned char* dirtytext) { | |
| 237 | |
| 238 unsigned int i, j; | |
| 239 unsigned char c, lastchar; | |
| 240 | |
| 241 j = 0; | |
| 242 for (i = 0; dirtytext[i] != '\0'; i++) { | |
| 243 | |
| 244 c = dirtytext[i]; | |
| 245 /* We can ignore '\r's */ | |
| 246 if ( (c >= ' ' && c <= '~') || c == '\n' || c == '\t') { | |
| 247 dirtytext[j] = c; | |
| 248 j++; | |
| 249 } | |
| 250 } | |
| 251 /* Null terminate */ | |
| 252 dirtytext[j] = '\0'; | |
| 253 } |