-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Enhancement/Update AWS CIS Benchmark to 1.2.0 #679
Enhancement/Update AWS CIS Benchmark to 1.2.0 #679
Conversation
ScoutSuite/providers/aws/rules/findings/iam-root-account-used-recently.json
Outdated
Show resolved
Hide resolved
ScoutSuite/providers/aws/rules/findings/iam-user-without-mfa.json
Outdated
Show resolved
Hide resolved
Updated all the old CIS Benchmark 1.0.0 IAM rules to the new format and added all the new CIS Bechmark 1.2.0 IAM rules. There are still a couple of issues to fix or check but it should all work with some minor tweaks. |
I just pushed a new commit where I updated all the old CIS Benchmark 1.0.0 Logging rules to the new format and added all the new CIS Bechmark 1.2.0 Logging rules. There are a few minor issues to be fixed before it works as intended. |
Codecov Report
@@ Coverage Diff @@
## develop #679 +/- ##
========================================
Coverage 65.03% 65.03%
========================================
Files 22 22
Lines 1530 1530
========================================
Hits 995 995
Misses 535 535 Continue to review full report at Codecov.
|
Current errors to be fixed:
|
….2.0 # Conflicts: # ScoutSuite/output/data/html/partials/aws/services.kms.regions.id.keys.html # ScoutSuite/providers/aws/resources/iam/credentialreports.py # ScoutSuite/providers/aws/rules/findings/cloudtrail-no-log-file-validation.json # ScoutSuite/providers/aws/rules/findings/cloudtrail-no-logging.json # ScoutSuite/providers/aws/rules/findings/config-recorder-not-configured.json # ScoutSuite/providers/aws/rules/findings/ec2-default-security-group-in-use.json # ScoutSuite/providers/aws/rules/findings/ec2-default-security-group-with-rules.json # ScoutSuite/providers/aws/rules/findings/ec2-security-group-opens-known-port-to-all.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-expiration-threshold.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-minimum-length.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-no-lowercase-required.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-no-number-required.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-no-symbol-required.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-no-uppercase-required.json # ScoutSuite/providers/aws/rules/findings/iam-password-policy-reuse-enabled.json # ScoutSuite/providers/aws/rules/findings/iam-root-account-no-mfa.json # ScoutSuite/providers/aws/rules/findings/iam-root-account-used-recently.json # ScoutSuite/providers/aws/rules/findings/iam-root-account-with-active-keys.json # ScoutSuite/providers/aws/rules/findings/iam-user-no-key-rotation.json # ScoutSuite/providers/aws/rules/findings/iam-user-with-policies.json # ScoutSuite/providers/aws/rules/findings/iam-user-without-mfa.json # ScoutSuite/providers/aws/rules/findings/s3-bucket-no-logging.json # ScoutSuite/providers/aws/rules/findings/vpc-subnet-without-flow-log.json
Finally ready to merge! Thanks @paurisa for the great work on this. |
No problem, it is a pleasure to contribute to this useful project. |
Changes:
This PR is for issue #434
Phases:
TODOs for @j4v:
cis-1-2-0.json
rulesetThis finding is already created in the rule
iam-root-account-no-hardware-mfa.json
. The resourceiam/credentialreports.py
is already set to fetch theVirtualMfaDevices
and parse it. The parsing of the returned data should get the serial-number of the mfa device and also a boolean containing whether the MFA device is hardware based or not.To check if a MFA device is hardware or virtual, the serial-number should be checked. If the serial-number contains "arn", then the device is virtaul. Otherwise, the device is hardware.
Once done, issue Add check for hardware based MFA for the root account in AWS #681 can be closed.
default
ruleset (+prop) where appropriatedetailed
ruleset where appropriatedetailed
rulesetThere are some findings that may have inappropriate arguments. For example, the
iam-password-policy-minimum-length
finding has the minimum length argument set to8
when the CIS recommendation is14
.cis-1-2-0.json
ruleset not returning an empty list when clicked.Further information of this issue can be found here: Enhancement/Update AWS CIS Benchmark to 1.2.0 #679 (comment)