Skip to content

Fix sudo_require_reauthentication remediations edge case #11279

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
vojtapolasek merged 3 commits into from
Nov 23, 2023
Merged

Fix sudo_require_reauthentication remediations edge case #11279

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b9543c
Fix edge case in sudo_require_reauthentication
Nov 14, 2023
3fc22cf
Add test to sudo_require_reauthentication
Nov 14, 2023
f002fdf
Apdate style of sudo_require_reauthentication
Nov 16, 2023
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
7 changes: 7 additions & 0 deletions linux_os/guide/system/software/sudo/sudo_require_reauthentication/ansible/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,10 @@
line: 'Defaults timestamp_timeout={{ var_sudo_timestamp_timeout }}'
validate: /usr/sbin/visudo -cf %s
when: edit_sudoers_timestamp_timeout_option is defined and not edit_sudoers_timestamp_timeout_option.changed

- name: Remove timestamp_timeout wrong values in /etc/sudoers
lineinfile:
path: /etc/sudoers
regexp: '^[\s]*Defaults\s.*\btimestamp_timeout[\s]*=[\s]*(?!{{ var_sudo_timestamp_timeout }}\b)[-]?\w+\b.*$'
state: absent
validate: /usr/sbin/visudo -cf %s
5 changes: 2 additions & 3 deletions linux_os/guide/system/software/sudo/sudo_require_reauthentication/bash/shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ if /usr/sbin/visudo -qcf /etc/sudoers; then
# sudoers file doesn't define Option timestamp_timeout
echo "Defaults timestamp_timeout=${var_sudo_timestamp_timeout}" >> /etc/sudoers
else
# sudoers file defines Option timestamp_timeout, remediate if appropriate value is not set
if ! grep -P "^[\s]*Defaults.*timestamp_timeout[\s]*=[\s]*${var_sudo_timestamp_timeout}.*$" /etc/sudoers; then

# sudoers file defines Option timestamp_timeout, remediate wrong values if present
if grep -qP "^[\s]*Defaults\s.*\btimestamp_timeout[\s]*=[\s]*(?!${var_sudo_timestamp_timeout}\b)[-]?\w+\b.*$" /etc/sudoers; then
sed -Ei "s/(^[[:blank:]]*Defaults.*timestamp_timeout[[:blank:]]*=)[[:blank:]]*[-]?\w+(.*$)/\1${var_sudo_timestamp_timeout}\2/" /etc/sudoers
fi
fi
Expand Down
10 changes: 10 additions & 0 deletions ...em/software/sudo/sudo_require_reauthentication/tests/conflicting_values_main_file.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
# packages = sudo
# variables = var_sudo_timestamp_timeout=0

if grep -q 'timestamp_timeout' /etc/sudoers; then
sed -i 's/.*timestamp_timeout.*/Defaults timestamp_timeout=-1/' /etc/sudoers
else
echo "Defaults timestamp_timeout=-1" >> /etc/sudoers
fi
echo "Defaults timestamp_timeout=0" >> /etc/sudoers