Skip to content

Bugfix/1636 Improve checks for AWS KMS CMKs with key rotation disabled #1637

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

Open
ph-l wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Bugfix/1636 Improve checks for AWS KMS CMKs with key rotation disabled #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c1ee62
Fixed incompatible packages - Update requirements.txt
Tim-Hoekstra Nov 30, 2023
373fc14
Merge pull request #1589 from Tim-Hoekstra/master
fernando-gallego May 8, 2024
4ff22f3
Revert "Fixed incompatible packages - Update requirements.txt"
fernando-gallego May 8, 2024
7feb470
Merge pull request #1633 from nccgroup/revert-1589-master
fernando-gallego May 8, 2024
7909f2f
Merge pull request #1635 from nccgroup/develop
fernando-gallego May 10, 2024
60d9776
fix: add additional checks for aws cmk where automatic key rotation i…
ph-l May 14, 2024
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
6 changes: 6 additions & 0 deletions ScoutSuite/providers/aws/resources/kms/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ async def _parse_key(self, raw_key):
['Disabled', 'PendingDeletion'] else True
key_dict['description'] = raw_key['metadata']['KeyMetadata']['Description'] if len(
raw_key['metadata']['KeyMetadata']['Description'].strip()) > 0 else None
key_dict['key_usage'] = raw_key['metadata']['KeyMetadata']['KeyUsage'] if len(
raw_key['metadata']['KeyMetadata']['KeyUsage'].strip()) > 0 else None
key_dict['origin'] = raw_key['metadata']['KeyMetadata']['Origin'] if len(
raw_key['metadata']['KeyMetadata']['Origin'].strip()) > 0 else None
if 'CustomKeyStoreId' in raw_key['metadata']['KeyMetadata']:
key_dict['custom_key_store_id'] = raw_key['metadata']['KeyMetadata']['CustomKeyStoreId']
key_dict['key_manager'] = raw_key['metadata']['KeyMetadata']['KeyManager'] if len(
raw_key['metadata']['KeyMetadata']['KeyManager'].strip()) > 0 else None
key_dict['key_spec'] = raw_key['metadata']['KeyMetadata']['KeySpec'] if len(
raw_key['metadata']['KeyMetadata']['KeySpec'].strip()) > 0 else None

# Handle keys who don't have these keys - seen in the wild, unsure why
if 'origin' not in key_dict.keys() or 'key_manager' not in key_dict.keys():
Expand Down
22 changes: 22 additions & 0 deletions ScoutSuite/providers/aws/rules/findings/kms-cmk-rotation-disabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,28 @@
"kms.regions.id.keys.id.key_enabled",
"true",
""
],
[
"kms.regions.id.keys.id.key_spec",
"containNoneOf",
[
"RSA_2048",
"RSA_3072",
"RSA_4096",
"ECC_NIST_P256",
"ECC_NIST_P384",
"ECC_NIST_P521",
"ECC_SECG_P256K1",
"HMAC_224",
"HMAC_256",
"HMAC_384",
"HMAC_512"
]
],
[
"kms.regions.id.keys.id.",
"withoutKey",
"custom_key_store_id"
]
],
"id_suffix": "rotation_enabled"
Expand Down