Add sudoedit to the parser

src/sudoers/ast.rs

@@ -395,17 +395,17 @@ impl Parse for MetaOrTag {
                 "INTERCEPT is not supported by sudo-rs"
             ),
             // this is less fatal
-            "LOG_INPUT" | "NOLOG_INPUT" | "LOG_OUTPUT" | "NOLOG_OUTPUT" | "MAIL" | "NOMAIL" => {
+            "LOG_INPUT" | "NOLOG_INPUT" | "LOG_OUTPUT" | "NOLOG_OUTPUT" | "MAIL" | "NOMAIL"
+            | "FOLLOW" => {
                 eprintln_ignore_io_error!(
                     "warning: {} tags are ignored by sudo-rs",
                     keyword.as_str()
                 );
                 switch(|_| {})?
             }
 
-            // 'FOLLOW' and 'NOFOLLOW' are only usable in a sudoedit context, which will result in
-            // a parse error elsewhere. 'NOINTERCEPT' is the default behaviour.
-            "FOLLOW" | "NOFOLLOW" | "NOINTERCEPT" => switch(|_| {})?,
+            // 'NOFOLLOW' and 'NOINTERCEPT' are the default behaviour.
+            "NOFOLLOW" | "NOINTERCEPT" => switch(|_| {})?,
 
             "EXEC" => switch(|tag| tag.noexec = ExecControl::Exec)?,
             "NOEXEC" => switch(|tag| tag.noexec = ExecControl::Noexec)?,
@@ -471,31 +471,6 @@ impl Parse for CommandSpec {
             }
         }
 
-        let start_pos = stream.get_pos();
-        if let Some(Username(keyword)) = try_nonterminal(stream)? {
-            if keyword == "sudoedit" {
-                // note: special behaviour of forward slashes in wildcards, tread carefully
-                unrecoverable!(pos = start_pos, stream, "sudoedit is not yet supported");
-            } else if keyword == "list" {
-                return make(CommandSpec(
-                    tags,
-                    Allow(Meta::Only((glob::Pattern::new("list").unwrap(), None))),
-                ));
-            } else if keyword.starts_with("sha") {
-                unrecoverable!(
-                    pos = start_pos,
-                    stream,
-                    "digest specifications are not supported"
-                )
-            } else {
-                unrecoverable!(
-                    pos = start_pos,
-                    stream,
-                    "expected command but found {keyword}"
-                )
-            };
-        }
-
         let cmd: Spec<Command> = expect_nonterminal(stream)?;
 
         make(CommandSpec(tags, cmd))

src/sudoers/test/mod.rs

@@ -262,6 +262,10 @@ fn permission_test() {
     // apparmor
     #[cfg(feature = "apparmor")]
     pass!(["ALL ALL=(ALL:ALL) APPARMOR_PROFILE=unconfined ALL"], "user" => root(), "server"; "/bin/bar" => [apparmor_profile: Some("unconfined".to_string())]);
+
+    // list
+    pass!(["ALL ALL=(ALL:ALL) /bin/ls, list"], "user" => root(), "server"; "list");
+    FAIL!(["ALL ALL=(ALL:ALL) ALL, !list"], "user" => root(), "server"; "list");
 }
 
 #[test]
@@ -374,6 +378,23 @@ fn inclusive_username() {
     assert_eq!(sirin, "şirin");
 }
 
+#[test]
+fn sudoedit_recognized() {
+    let CommandSpec(_, Qualified::Allow(Meta::Only((cmd, args)))) =
+        parse_eval::<ast::CommandSpec>("sudoedit /etc/tmux.conf")
+    else {
+        panic!();
+    };
+    assert_eq!(cmd.as_str(), "sudoedit");
+    assert_eq!(args.unwrap().as_ref(), &["/etc/tmux.conf"][..]);
+}
+
+#[test]
+#[should_panic = "list does not take arguments"]
+fn list_does_not_take_args() {
+    parse_eval::<ast::CommandSpec>("list /etc/tmux.conf");
+}
+
 #[test]
 fn directive_test() {
     let y = parse_eval::<Spec<UserSpecifier>>;

src/sudoers/tokens.rs

@@ -192,10 +192,14 @@ impl Token for Command {
             Some(args.into_boxed_slice())
         };
 
+        if command.as_str() == "list" && argpat.is_some() {
+            return Err("list does not take arguments".to_string());
+        }
+
         Ok((command, argpat))
     }
 
-    // all commands start with "/" except "sudoedit"
+    // all commands start with "/" except "sudoedit" or "list"
     fn accept_1st(c: char) -> bool {
         SimpleCommand::accept_1st(c)
     }
@@ -218,6 +222,15 @@ impl Token for SimpleCommand {
             pat.map_err(|err| format!("wildcard pattern error {err}"))
         };
 
+        // detect the two edges cases
+        if cmd == "list" || cmd == "sudoedit" {
+            return cvt_err(glob::Pattern::new(&cmd));
+        } else if cmd.starts_with("sha") {
+            return Err("digest specifications are not supported".to_string());
+        } else if !cmd.starts_with('/') {
+            return Err("fully qualified path needed".to_string());
+        }
+
         // record if the cmd ends in a slash and remove it if it does
         let is_dir = cmd.ends_with('/') && {
             cmd.pop();
@@ -240,9 +253,9 @@ impl Token for SimpleCommand {
         cvt_err(glob::Pattern::new(&cmd))
     }
 
-    // all commands start with "/" except "sudoedit"
+    // all commands start with "/" except "sudoedit" or "list"
     fn accept_1st(c: char) -> bool {
-        c == '/' || c == 's'
+        c == '/' || c == 's' || c == 'l'
     }
 
     fn accept(c: char) -> bool {