Skip to content
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.

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

Release devel -> main #104

Merged
merged 79 commits into from
Sep 26, 2023
Merged

Release devel -> main #104

merged 79 commits into from
Sep 26, 2023

Conversation

uk-bolly
Copy link
Member

Overall Review of Changes:
Many issues address
new workflow
updated linting
link updates
multiple improvements

Issue Fixes:

Many thanks to all those who contributed

#62
#67
#68
#79
#81
#88

PRS
#61
#63
#64
#66
#69
#70
#71
#72
#74
#75
#78
#83
#85
#87
#92
#95
#97
#98
#99
#100

Enhancements:
Lint updated
pre-commit added to the repository
multiple improvements to logic and tests

How has this been tested?:
Manually
pipeline to devel

jamesv1994 and others added 30 commits August 21, 2023 20:06
bugfix: When IPv6 is disabled / not available we can not add ufw rule.
Modify /etc/aide.conf when ubtu22cis_config_aide is true
Signed-off-by: Mark Bolwell <[email protected]>
…" with error "'state' cannot be specified on a template"

Signed-off-by: Jason Hendry <[email protected]>
…d-timesyncd

fix: #68 Role fails when ubtu22cis_time_sync_tool: "systemd-timesyncd…
Added condition for associated task #67
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Task validation fixes (by Steampunk Spotter)
…container

Removing duplicate variable signifying containerized systems.
Signed-off-by: Bernd Grobauer <[email protected]>
- The previous regex requires exactly *one* space between
    `default=ignore]` and `pam_unix.so` which on a default OS installetion never matches, is now fixed
- The `.*` in `(.*)(remember=([0-9]{1,})|)` was greedy, which means that
    everything after it never matches
- I name the groups now which is easier than the numbers
- I took care that when inserting a non-existing `remember=` before and after it is at least one space.
- A the same time I make sure that *not* on every run, an additonal
   space is added on replacement, so that the line is *not* endlessly
   growing.
- The `ansible.builtin.shell: grep 'password.*pam_unix.so' /etc/pam.d/common-password` do not require
    the `[success=1 default=ignore]` but the lineinfile regexs did,
    which would mean that the grep-regex match but not later lineinfile-regexes not ⇒
    I updated it, so that no one requires the `[success=1 default=ignore]`
    still prserves it.

Signed-off-by: Fabian Raab <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
bgro and others added 27 commits September 20, 2023 13:40
…inally in the lockdown role.

Signed-off-by: Bernd Grobauer <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
…bles

Improve variable documentation in `defaults/main.yml` (issue #84)
I think this is a transition error from an old implementation.
In CIS Ubuntu 20.04 v1.1 it was still /var/log/faillog, but in
CIS Ubuntu 20.04 v2.0 it has changed to /var/run/faillock and
hence in CIS Ubuntu 22.04 v1.0 it is also /var/run/faillock.

For Debian it is the same, for Debian 10 v1.0 it is /var/log/faillog,
but for Debian 11 v1.0 it is /var/run/faillock.

Signed-off-by: Fabian Raab <[email protected]>
…sers_not_detected_correctly

Optimization of `interactive-users` detection(issue #86)
…ith Ansible-Galaxy linting requirements

Signed-off-by: Ionut Pruteanu <[email protected]>
…SessionProfileCreation

Fixing syntax for 1.8.4, sub-task | session profile |
Signed-off-by: Bernd Grobauer <[email protected]>
Signed-off-by: Bernd Grobauer <[email protected]>
…ot_quite_correct

Getting rule 4.1.3.2 in line with what CIS expects.
Removing restricting of chage operations to UIDs > 1000
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
…sword_reuse_limited

fix(R5.4.3). Correct regexes so that they match
🐛(R4.1.3.12): Change wrong /var/log/faillog to /var/run/faillock
Signed-off-by: Mark Bolwell <[email protected]>
Copy link
Contributor

@frederickw082922 frederickw082922 left a comment

Choose a reason for hiding this comment

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

Great work!! Thank you!!

@uk-bolly uk-bolly merged commit 741608c into main Sep 26, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants