Unconditionally enable sudoedit support

sudoedit support has been enabled by default since 0.2.8.

Author: bjorn3

Cargo.toml

@@ -34,7 +34,7 @@ libc = "0.2.152"
 glob = "0.3.0"
 
 [features]
-default = ["sudoedit"]
+default = []
 
 # when enabled, use "sudo-i" PAM service name for sudo -i instead of "sudo"
 # ONLY ENABLE THIS FEATURE if you know that original sudo uses "sudo-i"
@@ -52,9 +52,7 @@ dev = []
 # compilation using "cargo --all-features", which should not be used on sudo-rs
 do-not-use-all-features = []
 
-# whether to enable 'sudoedit' (this will become a default feature, or
-# perhaps we can just remove the feature flag altogether)
-# NOTE: this is currently work in progress and *NOT* implemented
+# sudoedit support is now always enabled. this feature only exists for back compat reasons
 sudoedit = []
 
 [profile.release]

src/common/context.rs

@@ -2,7 +2,6 @@ use std::{env, io};
 
 use crate::common::{HARDENED_ENUM_VALUE_0, HARDENED_ENUM_VALUE_1, HARDENED_ENUM_VALUE_2};
 use crate::exec::{RunOptions, Umask};
-#[cfg_attr(not(feature = "sudoedit"), allow(unused_imports))]
 use crate::sudo::{SudoEditOptions, SudoListOptions, SudoRunOptions, SudoValidateOptions};
 use crate::sudoers::Sudoers;
 use crate::system::{audit::sudo_call, Group, Hostname, Process, User};
@@ -36,7 +35,6 @@ pub struct Context {
     pub umask: Umask,
     pub noninteractive_auth: bool,
     // sudoedit
-    #[cfg_attr(not(feature = "sudoedit"), allow(unused))]
     pub files_to_edit: Vec<Option<SudoPath>>,
 }
 
@@ -111,7 +109,6 @@ impl Context {
         })
     }
 
-    #[cfg(feature = "sudoedit")]
     pub fn from_edit_opts(sudo_options: SudoEditOptions) -> Result<Context, Error> {
         use std::path::Path;
         let hostname = Hostname::resolve();

src/sudo/cli/mod.rs

@@ -6,13 +6,11 @@ use std::{borrow::Cow, mem};
 use crate::common::{SudoPath, SudoString};
 
 pub mod help;
-#[cfg_attr(not(feature = "sudoedit"), allow(unused))]
 pub mod help_edit;
 
 #[cfg(test)]
 mod tests;
 
-#[cfg_attr(not(feature = "sudoedit"), allow(dead_code))]
 pub enum SudoAction {
     Edit(SudoEditOptions),
     Help(SudoHelpOptions),
@@ -222,7 +220,6 @@ impl TryFrom<SudoOptions> for SudoValidateOptions {
 }
 
 // sudo -e [-ABkNnS] [-r role] [-t type] [-C num] [-D directory] [-g group] [-h host] [-p prompt] [-R directory] [-T timeout] [-u user] file ...
-#[cfg_attr(not(feature = "sudoedit"), allow(dead_code))]
 pub struct SudoEditOptions {
     // -B
     pub bell: bool,

src/sudo/mod.rs

@@ -15,7 +15,6 @@ use std::path::PathBuf;
 
 mod cli;
 pub(crate) use cli::{SudoEditOptions, SudoListOptions, SudoRunOptions, SudoValidateOptions};
-#[cfg(feature = "sudoedit")]
 mod edit;
 
 pub(crate) mod diagnostic;
@@ -119,13 +118,7 @@ fn sudo_process() -> Result<(), Error> {
                 }
             }
             SudoAction::List(options) => pipeline::run_list(options),
-            #[cfg(feature = "sudoedit")]
             SudoAction::Edit(options) => pipeline::run_edit(options),
-            #[cfg(not(feature = "sudoedit"))]
-            SudoAction::Edit(_) => {
-                eprintln_ignore_io_error!("error: `--edit` flag has not yet been implemented");
-                std::process::exit(1);
-            }
         },
         Err(e) => {
             eprintln_ignore_io_error!("{e}\n{}", usage_msg);

src/sudo/pipeline.rs

@@ -21,9 +21,7 @@ use crate::system::{escape_os_str_lossy, Process};
 mod list;
 pub(super) use list::run_list;
 
-#[cfg(feature = "sudoedit")]
 mod edit;
-#[cfg(feature = "sudoedit")]
 pub(super) use edit::run_edit;
 
 fn read_sudoers() -> Result<Sudoers, Error> {

src/sudoers/policy.rs

@@ -145,7 +145,6 @@ impl Judgement {
         }
     }
 
-    #[cfg_attr(not(feature = "sudoedit"), allow(unused))]
     pub(crate) fn preferred_editor(&self) -> std::path::PathBuf {
         super::select_editor(&self.settings, true)
     }

src/system/audit.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(not(feature = "sudoedit"), allow(dead_code))]
 use std::collections::HashSet;
 use std::ffi::{CStr, CString};
 use std::fs::{DirBuilder, File, Metadata, OpenOptions};

test-framework/sudo-test/src/docker.rs

@@ -192,9 +192,6 @@ pub fn build_base_image() {
                     #[cfg(feature = "apparmor")]
                     features.push("apparmor");
 
-                    // TEMPORARY: when sudoedit is mainlined we can remove this
-                    features.push("sudoedit");
-
                     features.join(",")
                 });
 

util/build-release.sh

@@ -14,7 +14,7 @@ DATE=$(grep -m1 '^##' "$PROJECT_DIR"/CHANGELOG.md | grep -o '[0-9]\{4\}-[0-9]\{2
 # Build binaries
 docker build --pull --tag "$BUILDER_IMAGE_TAG" --file "$SCRIPT_DIR/Dockerfile-release" "$SCRIPT_DIR"
 docker run --rm --user "$(id -u):$(id -g)" -v "$PROJECT_DIR:/build" -w "/build" "$BUILDER_IMAGE_TAG" cargo clean
-docker run --rm --user "$(id -u):$(id -g)" -v "$PROJECT_DIR:/build" -w "/build" "$BUILDER_IMAGE_TAG" cargo build --release --features pam-login,sudoedit,apparmor
+docker run --rm --user "$(id -u):$(id -g)" -v "$PROJECT_DIR:/build" -w "/build" "$BUILDER_IMAGE_TAG" cargo build --release --features pam-login,apparmor
 
 # Generate man pages
 "$PROJECT_DIR/util/generate-docs.sh"