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

Don't require a pty for intercept or log_subcmmds.

Browse Source 
The code to take back control of the tty before a policy check
doesn't appear to be needed.  If the command is run in its own pty,
sudo has control over the user's tty.  If the command is run in
the user's tty, sudo should be in the foreground process group.
This commit is contained in:
Todd C. Miller
2022-04-20 11:56:26 -06:00
parent 839c189373
commit 841375783a
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/exec.c
View File

@@ -322,7 +322,7 @@ sudo_needs_pty(struct command_details *details)
{ {
struct plugin_container *plugin; struct plugin_container *plugin;
if (ISSET(details->flags, CD_USE_PTY|CD_INTERCEPT|CD_LOG_SUBCMDS)) if (ISSET(details->flags, CD_USE_PTY))
return true; return true;
TAILQ_FOREACH(plugin, &io_plugins, entries) { TAILQ_FOREACH(plugin, &io_plugins, entries) {

23
src/exec_intercept.c
View File

@@ -36,7 +36,6 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <termios.h>
#include "sudo.h" #include "sudo.h"
#include "sudo_exec.h" #include "sudo_exec.h"
@@ -517,11 +516,8 @@ intercept_read(int fd, struct intercept_closure *closure)
{ {
struct sudo_event_base *evbase = sudo_ev_get_base(&closure->ev); struct sudo_event_base *evbase = sudo_ev_get_base(&closure->ev);
InterceptRequest *req = NULL; InterceptRequest *req = NULL;
pid_t saved_pgrp = -1;
struct termios oterm;
ssize_t nread; ssize_t nread;
bool ret = false; bool ret = false;
int ttyfd = -1;
debug_decl(intercept_read, SUDO_DEBUG_EXEC); debug_decl(intercept_read, SUDO_DEBUG_EXEC);
if (closure->state == RECV_SECRET) { if (closure->state == RECV_SECRET) {
@@ -619,24 +615,7 @@ unpack:
goto done; goto done;
} }
/* Take back control of the tty, if necessary, for the policy check. */
ttyfd = open(_PATH_TTY, O_RDWR);
if (ttyfd != -1) {
saved_pgrp = tcgetpgrp(ttyfd);
if (saved_pgrp == -1 || tcsetpgrp(ttyfd, getpgid(0)) == -1 ||
tcgetattr(ttyfd, &oterm) == -1) {
close(ttyfd);
ttyfd = -1;
}
}
ret = intercept_check_policy(req->u.policy_check_req, closure); ret = intercept_check_policy(req->u.policy_check_req, closure);
/* We must restore tty before any error handling. */
if (ttyfd != -1) {
(void)tcsetattr(ttyfd, TCSASOFT|TCSAFLUSH, &oterm);
(void)tcsetpgrp(ttyfd, saved_pgrp);
}
if (!ret) if (!ret)
goto done; goto done;
break; break;
@@ -675,8 +654,6 @@ unpack:
ret = true; ret = true;
done: done:
if (ttyfd != -1)
close(ttyfd);
intercept_request__free_unpacked(req, NULL); intercept_request__free_unpacked(req, NULL);
debug_return_bool(ret); debug_return_bool(ret);
} }