isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize the pty rows/cols based on the values we stored in user_details.

Browse Source 
This fixes a minor issue where we would send an extra window size
change event the first time the command was suspended.
This commit is contained in:
Todd C. Miller
2018-10-05 14:04:29 -06:00
parent c0e8bde104
commit e2570307e6
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/exec_pty.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -58,6 +58,8 @@ struct exec_closure_pty {
pid_t monitor_pid; pid_t monitor_pid;
pid_t cmnd_pid; pid_t cmnd_pid;
pid_t ppgrp; pid_t ppgrp;
short rows;
short cols;
struct command_status *cstat; struct command_status *cstat;
struct command_details *details; struct command_details *details;
struct sudo_event_base *evbase; struct sudo_event_base *evbase;
@@ -1101,6 +1103,8 @@ fill_exec_closure_pty(struct exec_closure_pty *ec, struct command_status *cstat,
ec->ppgrp = ppgrp; ec->ppgrp = ppgrp;
ec->cstat = cstat; ec->cstat = cstat;
ec->details = details; ec->details = details;
ec->rows = user_details.ts_rows;
ec->cols = user_details.ts_cols;
TAILQ_INIT(&ec->monitor_messages); TAILQ_INIT(&ec->monitor_messages);
/* Setup event base and events. */ /* Setup event base and events. */
@@ -1685,12 +1689,11 @@ del_io_events(bool nonblocking)
static void static void
sync_ttysize(struct exec_closure_pty *ec) sync_ttysize(struct exec_closure_pty *ec)
{ {
static struct winsize owsize;
struct winsize wsize; struct winsize wsize;
debug_decl(sync_ttysize, SUDO_DEBUG_EXEC); debug_decl(sync_ttysize, SUDO_DEBUG_EXEC);
if (ioctl(io_fds[SFD_USERTTY], TIOCGWINSZ, &wsize) == 0) { if (ioctl(io_fds[SFD_USERTTY], TIOCGWINSZ, &wsize) == 0) {
if (wsize.ws_row != owsize.ws_row || wsize.ws_col != owsize.ws_col) { if (wsize.ws_row != ec->rows || wsize.ws_col != ec->cols) {
const unsigned int wsize_packed = (wsize.ws_row & 0xffff) | const unsigned int wsize_packed = (wsize.ws_row & 0xffff) |
((wsize.ws_col & 0xffff) << 16); ((wsize.ws_col & 0xffff) << 16);
@@ -1700,8 +1703,9 @@ sync_ttysize(struct exec_closure_pty *ec)
/* Send window change event to monitor process. */ /* Send window change event to monitor process. */
send_command_status(ec, CMD_TTYWINCH, wsize_packed); send_command_status(ec, CMD_TTYWINCH, wsize_packed);
/* Update old value. */ /* Update rows/cols. */
owsize = wsize; ec->rows = wsize.ws_row;
ec->cols = wsize.ws_col;
} }
} }

4
src/sudo.c
View File

@@ -595,8 +595,8 @@ get_user_info(struct user_details *ud)
goto oom; goto oom;
ud->host = user_info[i] + sizeof("host=") - 1; ud->host = user_info[i] + sizeof("host=") - 1;
sudo_get_ttysize(&ud->ts_lines, &ud->ts_cols); sudo_get_ttysize(&ud->ts_rows, &ud->ts_cols);
if (asprintf(&user_info[++i], "lines=%d", ud->ts_lines) == -1) if (asprintf(&user_info[++i], "lines=%d", ud->ts_rows) == -1)
goto oom; goto oom;
if (asprintf(&user_info[++i], "cols=%d", ud->ts_cols) == -1) if (asprintf(&user_info[++i], "cols=%d", ud->ts_cols) == -1)
goto oom; goto oom;

2
src/sudo.h
View File

@@ -107,8 +107,8 @@ struct user_details {
const char *shell; const char *shell;
GETGROUPS_T *groups; GETGROUPS_T *groups;
int ngroups; int ngroups;
int ts_rows;
int ts_cols; int ts_cols;
int ts_lines;
}; };
#define CD_SET_UID 0x00001 #define CD_SET_UID 0x00001