Add test for is_terminal_for_pgrp usage

Author: bjorn3

test-framework/sudo-compliance-tests/src/sudo/use_pty.rs

@@ -172,3 +172,42 @@ fn stderr_pipe() {
 
     assert_eq!(stdout, "hello world");
 }
+
+#[test]
+fn stdout_foreign_pty() {
+    let env = Env([SUDOERS_ALL_ALL_NOPASSWD, "Defaults use_pty"]).build();
+
+    // Everything is put in a single command with separators to keep the pts numbers predictable
+    let output = Command::new("sh")
+        .args([
+            "-c",
+            "socat - SYSTEM:'ls -l /proc/self/fd; echo @@@@; sudo ls -l /proc/self/fd',pty,setsid,ctty,stderr;
+            echo ====;
+            socat - SYSTEM:'ls -l /proc/self/fd; echo @@@@; sudo ls -l /proc/self/fd',pty,stderr",
+        ])
+        .tty(true)
+        .output(&env);
+
+    let stdout = output.stdout();
+    let (own_term, foreign_term) = stdout.split_once("====").unwrap();
+
+    let (own_term_in, own_term_sudo) = own_term.split_once("@@@@").unwrap();
+    assert_contains!(own_term_in, " 0 -> /dev/pts/1");
+    assert_contains!(own_term_in, " 1 -> /dev/pts/1");
+    assert_contains!(own_term_in, " 2 -> /dev/pts/0");
+    // pts/1 is our controlling tty, so it gets proxied.
+    // pts/0 is a foreign pty, so it gets inherited
+    assert_contains!(own_term_sudo, " 0 -> /dev/pts/2");
+    assert_contains!(own_term_sudo, " 1 -> /dev/pts/2");
+    assert_contains!(own_term_sudo, " 2 -> /dev/pts/0");
+
+    let (foreign_term_in, foreign_term_sudo) = foreign_term.split_once("@@@@").unwrap();
+    assert_contains!(foreign_term_in, " 0 -> /dev/pts/1");
+    assert_contains!(foreign_term_in, " 1 -> /dev/pts/1");
+    assert_contains!(foreign_term_in, " 2 -> /dev/pts/0");
+    // pts/1 is not our controlling tty, so it gets inherited.
+    // pts/0 is our controlling tty, so it gets proxied
+    assert_contains!(foreign_term_sudo, " 0 -> /dev/pts/1");
+    assert_contains!(foreign_term_sudo, " 1 -> /dev/pts/1");
+    assert_contains!(foreign_term_sudo, " 2 -> /dev/pts/2");
+}

test-framework/sudo-test/src/ours.freebsd.Dockerfile

@@ -1,5 +1,5 @@
 FROM dougrabson/freebsd14.1-small:latest
-RUN IGNORE_OSVERSION=yes pkg install -y sshpass rsyslog bash vim pidof dash
+RUN IGNORE_OSVERSION=yes pkg install -y sshpass rsyslog bash vim pidof dash socat
 WORKDIR /usr/src/sudo
 COPY target/build build
 # set setuid on install

test-framework/sudo-test/src/ours.linux.Dockerfile

@@ -1,6 +1,6 @@
 FROM rust:1-slim-trixie
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends apparmor libpam0g-dev libapparmor1 procps sshpass rsyslog ca-certificates tzdata
+    apt-get install -y --no-install-recommends apparmor libpam0g-dev libapparmor1 procps sshpass rsyslog ca-certificates tzdata socat
 # cache the crates.io index in the image for faster local testing
 RUN cargo search sudo
 WORKDIR /usr/src/sudo

test-framework/sudo-test/src/theirs.freebsd.Dockerfile

@@ -1,5 +1,5 @@
 FROM dougrabson/freebsd14.1-small:latest
-RUN IGNORE_OSVERSION=yes pkg install -y sudo pidof sshpass rsyslog bash vim dash FreeBSD-libbsm && \
+RUN IGNORE_OSVERSION=yes pkg install -y sudo pidof sshpass rsyslog bash vim dash FreeBSD-libbsm socat && \
     rm /usr/local/etc/sudoers
 # Ensure we use the same shell across OSes
 RUN chsh -s /bin/sh

test-framework/sudo-test/src/theirs.linux.Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:trixie-slim
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends sudo procps sshpass rsyslog && \
+    apt-get install -y --no-install-recommends sudo procps sshpass rsyslog socat && \
     rm /etc/sudoers
 # Ensure we use the same shell across OSes
 RUN chsh -s /bin/sh