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

March 24 updates #68

Merged
merged 10 commits into from
Mar 27, 2024
Merged

March 24 updates #68

merged 10 commits into from
Mar 27, 2024

Conversation

uk-bolly
Copy link
Member

@uk-bolly uk-bolly commented Mar 27, 2024

Overall Review of Changes:
Many issues and PRs
improvements to multiple control

Issue Fixes:

Enhancements:
New variable discovery and naming for interactve users

  • extended with new options to force changes for 4.6.1.1|2|3 default false
    • amzn2023cis_force_user_maxdays
    • amzn2023cis_force_user_mindays
    • amzn2023cis_force_user_warndays

How has this been tested?:
Manually

uk-bolly added 10 commits March 26, 2024 10:10
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]>
Signed-off-by: Mark Bolwell <[email protected]>
@uk-bolly uk-bolly changed the title March 24 March 24 updates Mar 27, 2024
Copy link

@georgenalen georgenalen left a comment

Choose a reason for hiding this comment

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

looks good!

@uk-bolly uk-bolly merged commit 6fc3814 into devel Mar 27, 2024
4 checks passed
@uk-bolly uk-bolly deleted the March_24 branch March 27, 2024 15:43
uk-bolly added a commit that referenced this pull request Apr 15, 2024
* Fixing issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/3 by editing the destination path!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/4 by masking both the socket and the service!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/6 by editing the value of `clientalivecountmax` to 3!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/2 by using `import_tasks` module so as the rules will get added and executed!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/5 by adding the necessary lines to both sshd_config file and sshd_config.d/ files. The same method is used for all the rules from 4.2.x, to make them compliant with CISs checks.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing trailing whitespaces

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing trailing whitespaces and fixing an end-of-file

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Refactoring docs

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Small fixings for https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/19

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing trailing whitespace

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing fail message so that is states the correct number of the rule that requires the root password to be set

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing inconsistencies for issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/22

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing minor syntax issues by adding missing "PATCH" keywords or missing "|".

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Fixing PRELIM task "PRELIM | 4.3.3 | Find all sudoers files" mentioned in issue https://code.siemens.com/infosec-pss-gov/security-crafter-baseline-automations/ansible-lockdown/amazon2023-cis/-/issues/22.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing 1.1.2.1 from multiline task 1.1.2.2 ,1.1.2.3, 1.1.2.4 because it was not supposed to be there!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing prelim for installing authconfig, as it is not used.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0)
- [github.com/gitleaks/gitleaks: v8.17.0 → v8.18.2](gitleaks/gitleaks@v8.17.0...v8.18.2)
- [github.com/ansible-community/ansible-lint: v6.18.0 → v24.2.0](ansible/ansible-lint@v6.18.0...v24.2.0)
- [github.com/adrienverge/yamllint.git: v1.32.0 → v1.35.1](https://github.com/adrienverge/yamllint.git/compare/v1.32.0...v1.35.1)

* Removing the 6.1.12 duplicate task and adding it to the 6.1.10 task as it was implementing something needed by 6.1.10.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* De-commenting allow and deny variables for sshd.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Removing double import of cis_5.3.yml.

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* As authconfig is not needed anymore, the variable related to its installation is removed!

Signed-off-by: Diana-Maria Dumitru <[email protected]>

* Feb 24 updates to devel (#58)

* updated to use ansible_facts variables

Signed-off-by: Mark Bolwell <[email protected]>

* Squashed commit of the following:

commit 0cad737fe35db33ff0b867ac4439688cd2bcb009
Author: Mark Bolwell <[email protected]>
Date:   Fri Feb 23 09:41:39 2024 +0000

    updated and tidied up

    Signed-off-by: Mark Bolwell <[email protected]>

commit 1fa72013209866be66f7f2a353b9cf6264a3681d
Author: Mark Bolwell <[email protected]>
Date:   Fri Feb 23 09:41:10 2024 +0000

    audit_only

    Signed-off-by: Mark Bolwell <[email protected]>

Signed-off-by: Mark Bolwell <[email protected]>

* Always tag for 1.2.1 gpg_key package update #14

Signed-off-by: Mark Bolwell <[email protected]>

* tidy up prelim removal step

Signed-off-by: Mark Bolwell <[email protected]>

* updated changelog

Signed-off-by: Mark Bolwell <[email protected]>

* removed inject facts as vars

Signed-off-by: Mark Bolwell <[email protected]>

* 4.6.5 related to #27 thanks to @DianaMariaDDM

Signed-off-by: Mark Bolwell <[email protected]>

* 6.1.10 thanks to @DianaMariaDDM #37

Signed-off-by: Mark Bolwell <[email protected]>

* tage change to alwasy thanks to @DianaMariaDDM #41

Signed-off-by: Mark Bolwell <[email protected]>

* updated changelog

Signed-off-by: Mark Bolwell <[email protected]>

* updated changelog

Signed-off-by: Mark Bolwell <[email protected]>

---------

Signed-off-by: Mark Bolwell <[email protected]>

* updated ansible fact naming and checkout action (#64)

* updated ansible fact naming for ansible_facts.virtualization_type

Signed-off-by: Mark Bolwell <[email protected]>

* updated checkout version

Signed-off-by: Mark Bolwell <[email protected]>

* ansible fact update

Signed-off-by: Mark Bolwell <[email protected]>

* updated ansible facts and timeout now inherited

Signed-off-by: Mark Bolwell <[email protected]>

---------

Signed-off-by: Mark Bolwell <[email protected]>

* [pre-commit.ci] pre-commit autoupdate (#65)

updates:
- [github.com/ansible-community/ansible-lint: v24.2.0 → v24.2.1](ansible/ansible-lint@v24.2.0...v24.2.1)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* 4.2.16: Add variable for SSH MaxAuthTries (#66)

Signed-off-by: Tom Henderson <[email protected]>

* 4.2.16: Correct variable name and required max value (#67)

Signed-off-by: Tom Henderson <[email protected]>

* March 24 updates (#68)

* addressed #59 thanks to @DianaMariaDDM

Signed-off-by: Mark Bolwell <[email protected]>

* issue #59 thanks to @DianaMariaDDM

Signed-off-by: Mark Bolwell <[email protected]>

* issue #62 thanks to @DianaMariaDDM

Signed-off-by: Mark Bolwell <[email protected]>

* updated variable name in conditional

Signed-off-by: Mark Bolwell <[email protected]>

* updated

Signed-off-by: Mark Bolwell <[email protected]>

* updated container check

Signed-off-by: Mark Bolwell <[email protected]>

* updated authselect PR

Signed-off-by: Mark Bolwell <[email protected]>

* fix conditional typo

Signed-off-by: Mark Bolwell <[email protected]>

* fix conditional typo

Signed-off-by: Mark Bolwell <[email protected]>

* fix var typo

Signed-off-by: Mark Bolwell <[email protected]>

---------

Signed-off-by: Mark Bolwell <[email protected]>

* [pre-commit.ci] pre-commit autoupdate (#69)

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.5.0 → v4.6.0](pre-commit/pre-commit-hooks@v4.5.0...v4.6.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

---------

Signed-off-by: Diana-Maria Dumitru <[email protected]>
Signed-off-by: DianaMariaDDM <[email protected]>
Signed-off-by: Mark Bolwell <[email protected]>
Signed-off-by: Tom Henderson <[email protected]>
Co-authored-by: Diana-Maria Dumitru <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: DianaMariaDDM <[email protected]>
Co-authored-by: Tom Henderson <[email protected]>
Co-authored-by: Tom Henderson <[email protected]>
@uk-bolly uk-bolly mentioned this pull request Aug 13, 2024
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.

2 participants