Sudoedit compliance tests (batch 1) (#1213)

Author: squell

src/sudo/edit.rs

@@ -3,13 +3,14 @@
 use std::fs::File;
 use std::io::{Read, Seek, Write};
 use std::net::Shutdown;
-use std::os::unix::{net::UnixStream, process::ExitStatusExt};
+use std::os::unix::{fs::OpenOptionsExt, net::UnixStream, process::ExitStatusExt};
 use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::{io, process};
 
 use crate::common::SudoPath;
 use crate::exec::ExitReason;
+use crate::log::user_info;
 use crate::system::file::{create_temporary_dir, FileLock};
 use crate::system::wait::{Wait, WaitError, WaitOptions};
 use crate::system::{fork, ForkResult};
@@ -122,6 +123,7 @@ pub(super) fn edit_files(
         let data = file.new_data.expect("filled in above");
         if data == file.old_data {
             // File unchanged. No need to write it again.
+            user_info!("{} unchanged", file.path.display());
             continue;
         }
 
@@ -199,6 +201,7 @@ fn handle_child_inner(editor: &Path, mut files: Vec<ChildFileInfo<'_>>) -> Resul
             .read(true)
             .write(true)
             .create_new(true)
+            .mode(0o600)
             .open(&tempfile_path)
             .map_err(|e| {
                 format!(

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

@@ -8,6 +8,7 @@ mod macros;
 mod helpers;
 mod su;
 mod sudo;
+mod sudoedit;
 mod visudo;
 
 type Error = Box<dyn std::error::Error>;
@@ -46,6 +47,11 @@ const SUDOERS_NOT_USE_PTY: &str = "Defaults !use_pty";
 
 const ENV_PATH: &str = "/usr/bin/env";
 
+#[cfg(not(target_os = "freebsd"))]
+const DEFAULT_EDITOR: &str = "/usr/bin/editor";
+#[cfg(target_os = "freebsd")]
+const DEFAULT_EDITOR: &str = "/usr/bin/vi";
+
 const PANIC_EXIT_CODE: i32 = 101;
 
 enum EnvList {

test-framework/sudo-compliance-tests/src/snapshots/visudo/temporary_file_is_deleted_during_edition.snap renamed to test-framework/sudo-compliance-tests/src/snapshots/visudo/temporary_file_is_deleted_during_editing.snap

@@ -4,7 +4,7 @@ for _ in $(seq 1 20); do
     # when sudo runs with `use_pty` there are two sudo processes as sudo spawns
     # a monitor process. We want the PID of the sudo process so we assume it
     # must be the smallest of the returned PIDs. 
-    sudopid=$(pidof sudo | sort -gr | cut -f 1 -d ' ')
+    sudopid=$(pidof sudo | tr ' ' '\n' | sort -g | head -n1)
 
 	if [ -n "$sudopid" ]; then
         # give `expects-signal.sh ` some time to execute the `trap` command