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.

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

Fixed new features error handling #90

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Fixed new features error handling #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e952f5
Merge pull request #30 from aws-samples/main
kuettai Apr 26, 2024
fe2b324
Fix new features error handling
kuettai Apr 26, 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
8 changes: 7 additions & 1 deletion Screener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,13 @@ def scanByService(service, regions, filters):

GLOBALRESOURCES = Config.get(globalKey, [])
if len(GLOBALRESOURCES) > 0:
contexts[service[0]]['GLOBAL'] = GLOBALRESOURCES
garr = {}
ginfo = {}
for identifier, obj in GLOBALRESOURCES.items():
garr[identifier] = obj['results']
ginfo[identifier] = obj['info']

contexts[service[0]]['GLOBAL'] = arr

time_end = time.time()
scanned = Config.get(scannedKey)
Expand Down
3 changes: 3 additions & 0 deletions frameworks/Framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ def formatTitle(self, title):
return '<h3>' + title + '</h3>'

def getContent(self, _m):
if len(_m) == 0:
return

serv, check = _m.split(".")
if check == '$length':
cnt = self.getResourceCount(serv)
Expand Down
2 changes: 1 addition & 1 deletion frameworks/FrameworkPageBuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from frameworks.WAFS.WAFS import WAFS
from frameworks.MSR.MSR import MSR
from frameworks.CIS.CIS import CIS
from frameworks.CIS.CIS import NIST
from frameworks.NIST.NIST import NIST

class FrameworkPageBuilder(PageBuilder):
COMPLIANCE_STATUS = ["Not available", "Compliant", "Need Attention"]
Expand Down
6 changes: 3 additions & 3 deletions frameworks/NIST/map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"2": ["ec2.SGDefaultDisallowTraffic"],
"3": ["ec2.EBSInUse", "ec2.EBSEncrypted"],
"4": ["ec2.EC2Active"],
"5": [""],
"5": [],
"6": [],
"7": ["ec2.EBSEncrypted"],
"8": ["ec2.ASGIMDSv2"],
Expand Down Expand Up @@ -297,7 +297,7 @@
"22": [],
"23": [],
"24": ["rds.DefaultMasterAdmin"],
"25": ["rdsDefaultMasterAdmin"],
"25": ["rds.DefaultMasterAdmin"],
"26": [],
"27": ["rds.StorageEncrypted"],
"34": [],
Expand Down Expand Up @@ -331,7 +331,7 @@
"13": ["s3.BucketLifecycle"],
"14": ["s3.BucketVersioning"],
"15": ["s3.ObjectLock"],
"17": ["ServerSideEncrypted", "s3.SSEWithKMS"],
"17": ["s3.ServerSideEncrypted", "s3.SSEWithKMS"],
"19": [],
"20": ["s3.MFADelete"]
},
Expand Down
Loading