Skip to content

fix(virusforget): correct --clean abort and --user validation #368

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

Open
maybebyte wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −1
Open

fix(virusforget): correct --clean abort and --user validation #368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a39b03a
fix(virusforget): skip restore when backup is absent
maybebyte Jul 15, 2026
6dc9685
fix(virusforget): exit when --user does not exist
maybebyte Jul 15, 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
10 changes: 9 additions & 1 deletion usr/libexec/security-misc/virusforget#security-misc-shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ parse_cmd_options() {
exit 1
fi
if ! id -u "$user_name" >/dev/null 2>&1; then
echo "ERROR: User '$user_name' does not appear to exist!"
echo "ERROR: User '$user_name' does not appear to exist!" >&2
exit 1
fi
}

Expand Down Expand Up @@ -297,6 +298,13 @@ unexpected_file() {
}

restore_file() {
## An extraneous file has no baseline backup to restore from; the caller
## has already removed it, which is the correct action. Return early so the
## 'cp' below does not fail on the missing backup and abort the entire
## '--clean' run (via 'set -e') on the first extraneous file encountered.
if [ ! -e "$full_path_backup" ]; then
return 0
fi
if [ "$test_mode" = "true" ]; then
echo "Simulate restoring file... $full_path_original" >&2
echo cp --no-dereference --archive "$full_path_backup" "$full_path_original"
Expand Down