Skip to content

Update facter regex to work for Rust sudo variant (sudo-rs) #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saz merged 2 commits into from
Mar 5, 2026
Merged

Update facter regex to work for Rust sudo variant (sudo-rs) #334

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a000a4
Update regex to work for Rust sudo variant (sudo-rs)
ky3mr2 Mar 4, 2026
67a8162
Update lib/facter/sudoversion.rb
saz Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/facter/sudoversion.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
setcode do
if Facter::Util::Resolution.which('sudo')
sudoversion = Facter::Util::Resolution.exec('sudo -V 2>&1')
%r{^Sudo version ([\w.]+)}.match(sudoversion)[1]
match = %r{^(?:Sudo version|sudo-rs)\s+([\w.]+)}i.match(sudoversion)
Copy link
Copy Markdown

@Sharpie Sharpie Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This silences an error, but may cause existing logic to do the wrong thing as sudo-rs has a very small version number compared to traditional sudo, and the fact does not communicate which is in use.

Copy link
Copy Markdown
Owner

@saz saz Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right about that, thanks for pointing it out. I guess it would be best to add another fact, sudokind or something like that, and extend any version checks to also check for the expected kind of sudo.

What do you think?

Copy link
Copy Markdown

@Sharpie Sharpie Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My thought was a new structured fact that contained both the implementation and the version:

{'sudo' => {'version' => '0.2.0', 'type' => 'sudo-rs'}}

And then have the existing sudoversion return nil when an unrecognized version string appears. That should prevent any existing logic from thinking sudo-rs is a very old version of sudo and provide a new fact source that pairs the version with the type of implementation.

match[1] if match
elsif Facter::Util::Resolution.which('rpm')
Facter::Util::Resolution.exec('rpm -q sudo --qf \'%{VERSION}\'')
elsif Facter::Util::Resolution.which('dpkg-query')
Expand Down
Loading