=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/clientloop.c,v retrieving revision 1.65.2.5 retrieving revision 1.66 diff -u -r1.65.2.5 -r1.66 --- src/usr.bin/ssh/clientloop.c 2002/06/02 22:56:10 1.65.2.5 +++ src/usr.bin/ssh/clientloop.c 2001/04/29 19:16:52 1.66 @@ -35,7 +35,7 @@ * * * SSH2 support added by Markus Friedl. - * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. + * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.65.2.5 2002/06/02 22:56:10 miod Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.66 2001/04/29 19:16:52 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -81,7 +81,6 @@ #include "atomicio.h" #include "sshtty.h" #include "misc.h" -#include "readpass.h" /* import options */ extern Options options; @@ -102,8 +101,7 @@ * window size to be sent to the server a little later. This is volatile * because this is updated in a signal handler. */ -static volatile sig_atomic_t received_window_change_signal = 0; -static volatile sig_atomic_t received_signal = 0; +static volatile int received_window_change_signal = 0; /* Flag indicating whether the user\'s terminal is in non-blocking mode. */ static int in_non_blocking_mode = 0; @@ -125,7 +123,7 @@ static int need_rekeying; /* Set to non-zero if rekeying is requested. */ static int session_closed = 0; /* In SSH2: login session closed. */ -static void client_init_dispatch(void); +void client_init_dispatch(void); int session_ident = -1; /*XXX*/ @@ -133,7 +131,7 @@ /* Restores stdin to blocking mode. */ -static void +void leave_non_blocking(void) { if (in_non_blocking_mode) { @@ -145,7 +143,7 @@ /* Puts stdin terminal in non-blocking mode. */ -static void +void enter_non_blocking(void) { in_non_blocking_mode = 1; @@ -158,7 +156,7 @@ * flag indicating that the window has changed. */ -static void +void window_change_handler(int sig) { received_window_change_signal = 1; @@ -170,11 +168,16 @@ * signals must be trapped to restore terminal modes. */ -static void +void signal_handler(int sig) { - received_signal = sig; - quit_pending = 1; + if (in_raw_mode()) + leave_raw_mode(); + if (in_non_blocking_mode) + leave_non_blocking(); + channel_stop_listening(); + packet_close(); + fatal("Killed by signal %d.", sig); } /* @@ -182,7 +185,7 @@ * available resolution. */ -static double +double get_current_time(void) { struct timeval tv; @@ -196,7 +199,7 @@ * not appear to wake up when redirecting from /dev/null. */ -static void +void client_check_initial_eof_on_stdin(void) { int len; @@ -248,14 +251,14 @@ * connection. */ -static void +void client_make_packets_from_stdin_data(void) { u_int len; /* Send buffered stdin data to the server. */ while (buffer_len(&stdin_buffer) > 0 && - packet_not_very_much_data_to_write()) { + packet_not_very_much_data_to_write()) { len = buffer_len(&stdin_buffer); /* Keep the packets at reasonable size. */ if (len > packet_get_maxsize()) @@ -280,7 +283,7 @@ * appropriate. */ -static void +void client_check_window_change(void) { struct winsize ws; @@ -317,12 +320,12 @@ * one of the file descriptors). */ -static void +void client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, - int *maxfdp, int *nallocp, int rekeying) + int *maxfdp, int rekeying) { /* Add any selections by the channel mechanism. */ - channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, rekeying); + channel_prepare_select(readsetp, writesetp, maxfdp, rekeying); if (!compat20) { /* Read from the connection, unless our buffers are full. */ @@ -343,16 +346,7 @@ if (buffer_len(&stderr_buffer) > 0) FD_SET(fileno(stderr), *writesetp); } else { - /* channel_prepare_select could have closed the last channel */ - if (session_closed && !channel_still_open() && - !packet_have_data_to_write()) { - /* clear mask since we did not call select() */ - memset(*readsetp, 0, *nallocp); - memset(*writesetp, 0, *nallocp); - return; - } else { - FD_SET(connection_in, *readsetp); - } + FD_SET(connection_in, *readsetp); } /* Select server connection if have data to write to the server. */ @@ -376,8 +370,8 @@ * We have to return, because the mainloop checks for the flags * set by the signal handlers. */ - memset(*readsetp, 0, *nallocp); - memset(*writesetp, 0, *nallocp); + memset(*readsetp, 0, *maxfdp); + memset(*writesetp, 0, *maxfdp); if (errno == EINTR) return; @@ -388,7 +382,7 @@ } } -static void +void client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr) { struct winsize oldws, newws; @@ -418,9 +412,9 @@ /* Check if the window size has changed. */ if (ioctl(fileno(stdin), TIOCGWINSZ, &newws) >= 0 && (oldws.ws_row != newws.ws_row || - oldws.ws_col != newws.ws_col || - oldws.ws_xpixel != newws.ws_xpixel || - oldws.ws_ypixel != newws.ws_ypixel)) + oldws.ws_col != newws.ws_col || + oldws.ws_xpixel != newws.ws_xpixel || + oldws.ws_ypixel != newws.ws_ypixel)) received_window_change_signal = 1; /* OK, we have been continued by the user. Reinitialize buffers. */ @@ -431,7 +425,7 @@ enter_raw_mode(); } -static void +void client_process_net_input(fd_set * readset) { int len; @@ -471,69 +465,8 @@ } } -static void -process_cmdline(void) -{ - void (*handler)(int); - char *s, *cmd; - u_short fwd_port, fwd_host_port; - char buf[1024], sfwd_port[6], sfwd_host_port[6]; - int local = 0; - - leave_raw_mode(); - handler = signal(SIGINT, SIG_IGN); - cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); - if (s == NULL) - goto out; - while (*s && isspace(*s)) - s++; - if (*s == 0) - goto out; - if (strlen(s) < 2 || s[0] != '-' || !(s[1] == 'L' || s[1] == 'R')) { - log("Invalid command."); - goto out; - } - if (s[1] == 'L') - local = 1; - if (!local && !compat20) { - log("Not supported for SSH protocol version 1."); - goto out; - } - s += 2; - while (*s && isspace(*s)) - s++; - - if (sscanf(s, "%5[0-9]:%255[^:]:%5[0-9]", - sfwd_port, buf, sfwd_host_port) != 3 && - sscanf(s, "%5[0-9]/%255[^/]/%5[0-9]", - sfwd_port, buf, sfwd_host_port) != 3) { - log("Bad forwarding specification."); - goto out; - } - if ((fwd_port = a2port(sfwd_port)) == 0 || - (fwd_host_port = a2port(sfwd_host_port)) == 0) { - log("Bad forwarding port(s)."); - goto out; - } - if (local) { - if (channel_setup_local_fwd_listener(fwd_port, buf, - fwd_host_port, options.gateway_ports) < 0) { - log("Port forwarding failed."); - goto out; - } - } else - channel_request_remote_forwarding(fwd_port, buf, - fwd_host_port); - log("Forwarding port."); -out: - signal(SIGINT, handler); - enter_raw_mode(); - if (cmd) - xfree(cmd); -} - /* process the characters one by one */ -static int +int process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len) { char string[1024]; @@ -584,19 +517,36 @@ continue; case '&': + /* XXX does not work yet with proto 2 */ + if (compat20) + continue; /* * Detach the program (continue to serve connections, * but put in background and no more new connections). */ + if (!stdin_eof) { + /* + * Sending SSH_CMSG_EOF alone does not always appear + * to be enough. So we try to send an EOF character + * first. + */ + packet_start(SSH_CMSG_STDIN_DATA); + packet_put_string("\004", 1); + packet_send(); + /* Close stdin. */ + stdin_eof = 1; + if (buffer_len(bin) == 0) { + packet_start(SSH_CMSG_EOF); + packet_send(); + } + } /* Restore tty modes. */ leave_raw_mode(); /* Stop listening for new connections. */ channel_stop_listening(); - snprintf(string, sizeof string, - "%c& [backgrounded]\n", escape_char); - buffer_append(berr, string, strlen(string)); + printf("%c& [backgrounded]\n", escape_char); /* Fork into background. */ pid = fork(); @@ -609,35 +559,14 @@ exit(0); } /* The child continues serving connections. */ - if (compat20) { - buffer_append(bin, "\004", 1); - /* fake EOF on stdin */ - return -1; - } else if (!stdin_eof) { - /* - * Sending SSH_CMSG_EOF alone does not always appear - * to be enough. So we try to send an EOF character - * first. - */ - packet_start(SSH_CMSG_STDIN_DATA); - packet_put_string("\004", 1); - packet_send(); - /* Close stdin. */ - stdin_eof = 1; - if (buffer_len(bin) == 0) { - packet_start(SSH_CMSG_EOF); - packet_send(); - } - } - continue; + continue; /*XXX ? */ case '?': snprintf(string, sizeof string, "%c?\r\n\ Supported escape sequences:\r\n\ ~. - terminate connection\r\n\ -~C - open a command line\r\n\ -~R - Request rekey (SSH protocol 2 only)\r\n\ +~R - Request rekey (SSH protocol 2 only)\r\n\ ~^Z - suspend ssh\r\n\ ~# - list forwarded connections\r\n\ ~& - background ssh (when waiting for connections to terminate)\r\n\ @@ -656,10 +585,6 @@ xfree(s); continue; - case 'C': - process_cmdline(); - continue; - default: if (ch != escape_char) { buffer_put_char(bin, escape_char); @@ -691,7 +616,7 @@ return bytes; } -static void +void client_process_input(fd_set * readset) { int len; @@ -726,7 +651,7 @@ packet_start(SSH_CMSG_EOF); packet_send(); } - } else if (escape_char == SSH_ESCAPECHAR_NONE) { + } else if (escape_char == -1) { /* * Normal successful read, and no escape character. * Just append the data to buffer. @@ -744,7 +669,7 @@ } } -static void +void client_process_output(fd_set * writeset) { int len; @@ -805,7 +730,7 @@ * preparatory phase. */ -static void +void client_process_buffered_input_packets(void) { dispatch_run(DISPATCH_NONBLOCK, &quit_pending, compat20 ? xxx_kex : NULL); @@ -813,20 +738,19 @@ /* scan buf[] for '~' before sending data to the peer */ -static int +int simple_escape_filter(Channel *c, char *buf, int len) { /* XXX we assume c->extended is writeable */ return process_escapes(&c->input, &c->output, &c->extended, buf, len); } -static void +void client_channel_closed(int id, void *arg) { if (id != session_ident) error("client_channel_closed: id %d != session_ident %d", id, session_ident); - channel_cancel_cleanup(id); session_closed = 1; if (in_raw_mode()) leave_raw_mode(); @@ -835,8 +759,8 @@ /* * Implements the interactive session with the server. This is called after * the user has been authenticated, and a command has been started on the - * remote host. If escape_char != SSH_ESCAPECHAR_NONE, it is the character - * used as an escape character for terminating or suspending the session. + * remote host. If escape_char != -1, it is the character used as an escape + * character for terminating or suspending the session. */ int @@ -844,7 +768,7 @@ { fd_set *readset = NULL, *writeset = NULL; double start_time, total_time; - int max_fd = 0, max_fd2 = 0, len, rekeying = 0, nalloc = 0; + int max_fd = 0, len, rekeying = 0; char buf[100]; debug("Entering interactive session."); @@ -890,6 +814,7 @@ signal(SIGINT, signal_handler); signal(SIGQUIT, signal_handler); signal(SIGTERM, signal_handler); + signal(SIGPIPE, SIG_IGN); if (have_pty) signal(SIGWINCH, window_change_handler); @@ -898,7 +823,7 @@ if (compat20) { session_ident = ssh2_chan_id; - if (escape_char != SSH_ESCAPECHAR_NONE) + if (escape_char != -1) channel_register_filter(session_ident, simple_escape_filter); if (session_ident != -1) @@ -950,9 +875,8 @@ * Wait until we have something to do (something becomes * available on one of the descriptors). */ - max_fd2 = max_fd; client_wait_until_can_do_something(&readset, &writeset, - &max_fd2, &nalloc, rekeying); + &max_fd, rekeying); if (quit_pending) break; @@ -1000,25 +924,9 @@ if (have_pty) signal(SIGWINCH, SIG_DFL); - channel_free_all(); + /* Stop listening for connections. */ + channel_stop_listening(); - if (have_pty) - leave_raw_mode(); - - /* restore blocking io */ - if (!isatty(fileno(stdin))) - unset_nonblock(fileno(stdin)); - if (!isatty(fileno(stdout))) - unset_nonblock(fileno(stdout)); - if (!isatty(fileno(stderr))) - unset_nonblock(fileno(stderr)); - - if (received_signal) { - if (in_non_blocking_mode) /* XXX */ - leave_non_blocking(); - fatal("Killed by signal %d.", (int) received_signal); - } - /* * In interactive mode (with pseudo tty) display a message indicating * that the connection has been closed. @@ -1027,7 +935,6 @@ snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host); buffer_append(&stderr_buffer, buf, strlen(buf)); } - /* Output any buffered data for stdout. */ while (buffer_len(&stdout_buffer) > 0) { len = write(fileno(stdout), buffer_ptr(&stdout_buffer), @@ -1052,6 +959,9 @@ stderr_bytes += len; } + if (have_pty) + leave_raw_mode(); + /* Clear and free any buffers. */ memset(buf, 0, sizeof(buf)); buffer_free(&stdin_buffer); @@ -1061,11 +971,11 @@ /* Report bytes transferred, and transfer rates. */ total_time = get_current_time() - start_time; debug("Transferred: stdin %lu, stdout %lu, stderr %lu bytes in %.1f seconds", - stdin_bytes, stdout_bytes, stderr_bytes, total_time); + stdin_bytes, stdout_bytes, stderr_bytes, total_time); if (total_time > 0) debug("Bytes per second: stdin %.1f, stdout %.1f, stderr %.1f", - stdin_bytes / total_time, stdout_bytes / total_time, - stderr_bytes / total_time); + stdin_bytes / total_time, stdout_bytes / total_time, + stderr_bytes / total_time); /* Return the exit status of the program. */ debug("Exit status %d", exit_status); @@ -1074,31 +984,31 @@ /*********/ -static void -client_input_stdout_data(int type, u_int32_t seq, void *ctxt) +void +client_input_stdout_data(int type, int plen, void *ctxt) { u_int data_len; char *data = packet_get_string(&data_len); - packet_check_eom(); + packet_integrity_check(plen, 4 + data_len, type); buffer_append(&stdout_buffer, data, data_len); memset(data, 0, data_len); xfree(data); } -static void -client_input_stderr_data(int type, u_int32_t seq, void *ctxt) +void +client_input_stderr_data(int type, int plen, void *ctxt) { u_int data_len; char *data = packet_get_string(&data_len); - packet_check_eom(); + packet_integrity_check(plen, 4 + data_len, type); buffer_append(&stderr_buffer, data, data_len); memset(data, 0, data_len); xfree(data); } -static void -client_input_exit_status(int type, u_int32_t seq, void *ctxt) +void +client_input_exit_status(int type, int plen, void *ctxt) { + packet_integrity_check(plen, 4, type); exit_status = packet_get_int(); - packet_check_eom(); /* Acknowledge the exit. */ packet_start(SSH_CMSG_EXIT_CONFIRMATION); packet_send(); @@ -1111,46 +1021,44 @@ quit_pending = 1; } -static Channel * +Channel * client_request_forwarded_tcpip(const char *request_type, int rchan) { Channel* c = NULL; char *listen_address, *originator_address; int listen_port, originator_port; - int sock; + int sock, newch; /* Get rest of the packet */ listen_address = packet_get_string(NULL); listen_port = packet_get_int(); originator_address = packet_get_string(NULL); originator_port = packet_get_int(); - packet_check_eom(); + packet_done(); debug("client_request_forwarded_tcpip: listen %s port %d, originator %s port %d", listen_address, listen_port, originator_address, originator_port); - sock = channel_connect_by_listen_address(listen_port); - if (sock < 0) { - xfree(originator_address); - xfree(listen_address); - return NULL; + sock = channel_connect_by_listen_adress(listen_port); + if (sock >= 0) { + newch = channel_new("forwarded-tcpip", + SSH_CHANNEL_CONNECTING, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, + xstrdup(originator_address), 1); + c = channel_lookup(newch); } - c = channel_new("forwarded-tcpip", - SSH_CHANNEL_CONNECTING, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, - xstrdup(originator_address), 1); xfree(originator_address); xfree(listen_address); return c; } -static Channel* +Channel* client_request_x11(const char *request_type, int rchan) { Channel *c = NULL; char *originator; int originator_port; - int sock; + int sock, newch; if (!options.forward_x11) { error("Warning: ssh server tried X11 forwarding."); @@ -1164,27 +1072,27 @@ } else { originator_port = packet_get_int(); } - packet_check_eom(); + packet_done(); /* XXX check permission */ debug("client_request_x11: request from %s %d", originator, originator_port); - xfree(originator); sock = x11_connect_display(); - if (sock < 0) - return NULL; - c = channel_new("x11", - SSH_CHANNEL_X11_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, - xstrdup("x11"), 1); - c->force_drain = 1; + if (sock >= 0) { + newch = channel_new("x11", + SSH_CHANNEL_X11_OPEN, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, + xstrdup("x11"), 1); + c = channel_lookup(newch); + } + xfree(originator); return c; } -static Channel* +Channel* client_request_agent(const char *request_type, int rchan) { Channel *c = NULL; - int sock; + int sock, newch; if (!options.forward_agent) { error("Warning: ssh server tried agent forwarding."); @@ -1192,19 +1100,19 @@ return NULL; } sock = ssh_get_authentication_socket(); - if (sock < 0) - return NULL; - c = channel_new("authentication agent connection", - SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, - xstrdup("authentication agent connection"), 1); - c->force_drain = 1; + if (sock >= 0) { + newch = channel_new("authentication agent connection", + SSH_CHANNEL_OPEN, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, + xstrdup("authentication agent connection"), 1); + c = channel_lookup(newch); + } return c; } /* XXXX move to generic input handler */ -static void -client_input_channel_open(int type, u_int32_t seq, void *ctxt) +void +client_input_channel_open(int type, int plen, void *ctxt) { Channel *c = NULL; char *ctype; @@ -1234,29 +1142,28 @@ c->remote_id = rchan; c->remote_window = rwindow; c->remote_maxpacket = rmaxpack; - if (c->type != SSH_CHANNEL_CONNECTING) { - packet_start(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION); - packet_put_int(c->remote_id); - packet_put_int(c->self); - packet_put_int(c->local_window); - packet_put_int(c->local_maxpacket); - packet_send(); - } + + packet_start(SSH2_MSG_CHANNEL_OPEN_CONFIRMATION); + packet_put_int(c->remote_id); + packet_put_int(c->self); + packet_put_int(c->local_window); + packet_put_int(c->local_maxpacket); + packet_send(); } else { debug("failure %s", ctype); packet_start(SSH2_MSG_CHANNEL_OPEN_FAILURE); packet_put_int(rchan); packet_put_int(SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED); if (!(datafellows & SSH_BUG_OPENFAILURE)) { - packet_put_cstring("open failed"); + packet_put_cstring("bla bla"); packet_put_cstring(""); } packet_send(); } xfree(ctype); } -static void -client_input_channel_req(int type, u_int32_t seq, void *ctxt) +void +client_input_channel_req(int type, int plen, void *ctxt) { Channel *c = NULL; int id, reply, success = 0; @@ -1281,7 +1188,7 @@ } else if (strcmp(rtype, "exit-status") == 0) { success = 1; exit_status = packet_get_int(); - packet_check_eom(); + packet_done(); } if (reply) { packet_start(success ? @@ -1291,30 +1198,11 @@ } xfree(rtype); } -static void -client_input_global_request(int type, u_int32_t seq, void *ctxt) -{ - char *rtype; - int want_reply; - int success = 0; - rtype = packet_get_string(NULL); - want_reply = packet_get_char(); - debug("client_input_global_request: rtype %s want_reply %d", rtype, want_reply); - if (want_reply) { - packet_start(success ? - SSH2_MSG_REQUEST_SUCCESS : SSH2_MSG_REQUEST_FAILURE); - packet_send(); - packet_write_wait(); - } - xfree(rtype); -} - -static void +void client_init_dispatch_20(void) { dispatch_init(&dispatch_protocol_error); - dispatch_set(SSH2_MSG_CHANNEL_CLOSE, &channel_input_oclose); dispatch_set(SSH2_MSG_CHANNEL_DATA, &channel_input_data); dispatch_set(SSH2_MSG_CHANNEL_EOF, &channel_input_ieof); @@ -1324,16 +1212,11 @@ dispatch_set(SSH2_MSG_CHANNEL_OPEN_FAILURE, &channel_input_open_failure); dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &client_input_channel_req); dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); - dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &client_input_global_request); /* rekeying */ dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit); - - /* global request reply messages */ - dispatch_set(SSH2_MSG_REQUEST_FAILURE, &client_global_request_reply); - dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &client_global_request_reply); } -static void +void client_init_dispatch_13(void) { dispatch_init(NULL); @@ -1352,14 +1235,14 @@ dispatch_set(SSH_SMSG_X11_OPEN, options.forward_x11 ? &x11_input_open : &deny_input_open); } -static void +void client_init_dispatch_15(void) { client_init_dispatch_13(); dispatch_set(SSH_MSG_CHANNEL_CLOSE, &channel_input_ieof); dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, & channel_input_oclose); } -static void +void client_init_dispatch(void) { if (compat20)