fix: 🐛 handle 'all' in outbound ports loop in rule rule_4.1.5 and apt/dpkg lock#137
Closed
tmeckel wants to merge 5 commits intoansible-lockdown:develfrom
Closed
fix: 🐛 handle 'all' in outbound ports loop in rule rule_4.1.5 and apt/dpkg lock#137tmeckel wants to merge 5 commits intoansible-lockdown:develfrom
apt/dpkg lock#137tmeckel wants to merge 5 commits intoansible-lockdown:develfrom
Conversation
|
Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown! |
apt/dpkg lock
Add ubtu24cis_apt_lock_timeout variable to configure wait time for dpkg/apt locks during package operations. Default set to 180 seconds. Signed-off-by: Thomas Meckel <tmeckel@users.noreply.github.com>
…tallation Signed-off-by: Thomas Meckel <tmeckel@users.noreply.github.com>
…iguration Update the loop condition to handle 'all' value properly in ufw outbound port configuration. Replace string containment check with exact equality comparison to prevent unintended behavior when 'all' is specified. Signed-off-by: Thomas Meckel <tmeckel@users.noreply.github.com>
974288e to
62f65cf
Compare
The ansible.builtin.package module does not support the lock_timeout parameter which is specific to apt. Switch to ansible.builtin.apt to properly utilize the apt lock timeout configuration.
…odules Use apt module instead of package module to support lock_timeout parameter for libpam-runtime and libpam-modules installation tasks.
4c1aeb8 to
1d950a0
Compare
d20b2db to
1d950a0
Compare
Merged
Member
|
hi @tmeckel Thank you again for this PR, there has been a large number of PRS since raised that addressed a few of these issues. In this case we would like to close this PR against the new PR. Kindest regards uk-bolly |
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overall Review of Changes:
UBUNTU24-CIS suffers from the same issues that UBUNTU22-CIS currently have:
apt/dpkglock causes failure in CIS 5.3.1.3 (libpam-pwquality install) UBUNTU22-CIS#330Issue Fixes:
This PR contains the same fixes as submitted with PR ansible-lockdown/UBUNTU22-CIS#329 in UBUNTU22-CIS
Enhancements:
N/A
How has this been tested?:
Local image building pipeline
Additional Information
This is the list of tasks using implicitly or expclicitly and suffer from not waiting on a locked apt/dpkg. All those tasks should be updated with a
lock_timeout: "{{ ubtu24cis_apt_lock_timeout }}"or another way eg when usingansible.builtin.commandtasks/pre_remediation_audit.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/prelim.ymlansible.builtin.packagetasks/section_1/cis_1.2.1.x.ymlansible.builtin.commandtasks/section_1/cis_1.2.1.x.ymlansible.builtin.commandtasks/section_1/cis_1.2.2.x.ymlansible.builtin.packagetasks/section_1/cis_1.3.1.x.ymlansible.builtin.packagetasks/section_1/cis_1.5.x.ymlansible.builtin.packagetasks/section_1/cis_1.5.x.ymlansible.builtin.packagetasks/section_1/cis_1.7.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.2.x.ymlansible.builtin.packagetasks/section_2/cis_2.3.1.x.ymlansible.builtin.packagetasks/section_2/cis_2.3.1.x.ymlansible.builtin.packagetasks/section_3/cis_3.1.x.ymlansible.builtin.packagetasks/section_4/cis_4.1.1.ymlansible.builtin.shelltasks/section_4/cis_4.2.x.ymlansible.builtin.packagetasks/section_4/cis_4.2.x.ymlansible.builtin.packagetasks/section_4/cis_4.4.1.x.ymlansible.builtin.packagetasks/section_4/cis_4.4.1.x.ymlansible.builtin.packagetasks/section_4/cis_4.4.1.x.ymlansible.builtin.packagetasks/section_5/cis_5.2.x.ymlansible.builtin.packagetasks/section_5/cis_5.3.1.x.ymlansible.builtin.packagetasks/section_5/cis_5.3.1.x.ymlansible.builtin.packagetasks/section_5/cis_5.3.1.x.ymlansible.builtin.packagetasks/section_6/cis_6.1.2.x.ymlansible.builtin.packagetasks/section_6/cis_6.1.3.x.ymlansible.builtin.packagetasks/section_6/cis_6.2.1.x.ymlansible.builtin.packagetasks/section_6/cis_6.3.x.ymlansible.builtin.package