tyler.durden
/
Win32-OpenSSH
mirror of https://github.com/PowerShell/Win32-OpenSSH.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix control-c working in sshd server 

control-c is handled correctly by sshd server and passed to shell for it
to process which usually means terminating the current program or
programs.
This commit is contained in:
quamrulmina 2015-10-26 15:19:27 -05:00
parent 1178689011
commit 1c258ec0ae
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
channels.c
View File

@ -2463,11 +2463,21 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
if ( c->client_tty ) if ( c->client_tty )
telProcessNetwork ( data, data_len ); // run it by ANSI engine if it is the ssh client telProcessNetwork ( data, data_len ); // run it by ANSI engine if it is the ssh client
else { else {
buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on if ( ( c->isatty) && (data_len ==1) && (data[0] == '\003') ) {
if ( c->isatty ) { // we echo the data if it is sshd server and pty interactive mode /* send control-c to the shell process */
if ( GenerateConsoleCtrlEvent ( CTRL_C_EVENT, 0 ) ) {
}
else {
debug3("GenerateConsoleCtrlEvent failed with %d\n",GetLastError());
}
}
else {
buffer_append(&c->output, data, data_len); // it is the sshd server, so pass it on
if ( c->isatty ) { // we echo the data if it is sshd server and pty interactive mode
buffer_append(&c->input, data, data_len); buffer_append(&c->input, data, data_len);
if ( (data_len ==1) && (data[0] == '\b') ) if ( (data_len ==1) && (data[0] == '\b') )
buffer_append(&c->input, " \b", 2); // for backspace, we need to send space and another backspace for visual erase buffer_append(&c->input, " \b", 2); // for backspace, we need to send space and another backspace for visual erase
}
} }
} }

10
session.c
View File

@ -605,6 +605,7 @@ do_exec_no_pty(Session *s, const char *command)
*/ */
HANDLE wfdtocmd = -1; HANDLE wfdtocmd = -1;
int retcode = -1;
if ( (!s -> is_subsystem) && (s ->ttyfd != -1)) if ( (!s -> is_subsystem) && (s ->ttyfd != -1))
{ {
//FreeConsole(); //FreeConsole();
@ -622,8 +623,6 @@ do_exec_no_pty(Session *s, const char *command)
//if (sockin[1] >= 0) //if (sockin[1] >= 0)
// sfd_set_to_console(sockin[1]); // mark it as Console type // sfd_set_to_console(sockin[1]); // mark it as Console type
//allocate_standard_descriptor(STDIN_FILENO);
//allocate_standard_descriptor(wfdtocmd); // put the std input handle in our global general handle table
} }
else else
socketpair(sockin); socketpair(sockin);
@ -880,8 +879,9 @@ do_exec_no_pty(Session *s, const char *command)
if (!(s -> is_subsystem)) { if (!(s -> is_subsystem)) {
// Send to the remote client ANSI/VT Sequence so that they send us CRLF in place of LF // Send to the remote client ANSI/VT Sequence so that they send us CRLF in place of LF
char *inittermseq = "\033[20h\033[?7h\0" ; // LFtoCRLF AUTOWRAPON
Channel *c=channel_by_id ( s->chanid ); Channel *c=channel_by_id ( s->chanid );
buffer_append(&c->input, "\033[20h", 5); buffer_append(&c->input, inittermseq, strlen(inittermseq));
channel_output_poll(); channel_output_poll();
} }
@ -908,6 +908,7 @@ do_exec_no_pty(Session *s, const char *command)
MultiByteToWideChar(CP_UTF8, 0, exec_command, -1, exec_command_w, MAX_PATH); MultiByteToWideChar(CP_UTF8, 0, exec_command, -1, exec_command_w, MAX_PATH);
DWORD dwStartupFlags = CREATE_SUSPENDED ; // 0 DWORD dwStartupFlags = CREATE_SUSPENDED ; // 0
SetConsoleCtrlHandler(NULL, FALSE);
b = CreateProcessAsUserW(hToken, NULL, exec_command_w, NULL, NULL, TRUE, b = CreateProcessAsUserW(hToken, NULL, exec_command_w, NULL, NULL, TRUE,
/*CREATE_NEW_PROCESS_GROUP*/ dwStartupFlags, NULL, s -> pw -> pw_dir, /*CREATE_NEW_PROCESS_GROUP*/ dwStartupFlags, NULL, s -> pw -> pw_dir,
&si, &pi); &si, &pi);
@ -969,6 +970,7 @@ do_exec_no_pty(Session *s, const char *command)
close(sockerr[0]); close(sockerr[0]);
ResumeThread ( pi.hThread ); /* now let cmd shell main thread be active s we have closed all i/o file handle that cmd will use */ ResumeThread ( pi.hThread ); /* now let cmd shell main thread be active s we have closed all i/o file handle that cmd will use */
SetConsoleCtrlHandler(NULL, TRUE);
/* /*
* Close child thread handles as we do not need it. Process handle we keep so that we can know if it has died o not * Close child thread handles as we do not need it. Process handle we keep so that we can know if it has died o not
@ -2726,7 +2728,9 @@ session_pty_req(Session *s)
pty_setowner(s->pw, s->tty); pty_setowner(s->pw, s->tty);
/* Set window size from the packet. */ /* Set window size from the packet. */
#ifndef WIN32_FIXME
pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel); pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
#endif
packet_check_eom(); packet_check_eom();
session_proctitle(s); session_proctitle(s);