Merge pull request #90 from kuettai/main

Fixed new features error handling

Screener.py

@@ -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)

frameworks/Framework.py

@@ -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)

frameworks/FrameworkPageBuilder.py

@@ -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"]

frameworks/NIST/map.json

@@ -96,7 +96,7 @@
             "2": ["ec2.SGDefaultDisallowTraffic"],
             "3": ["ec2.EBSInUse", "ec2.EBSEncrypted"],
             "4": ["ec2.EC2Active"],
-            "5": [""],
+            "5": [],
             "6": [],
             "7": ["ec2.EBSEncrypted"],
             "8": ["ec2.ASGIMDSv2"],
@@ -297,7 +297,7 @@
             "22": [],
             "23": [],
             "24": ["rds.DefaultMasterAdmin"],
-            "25": ["rdsDefaultMasterAdmin"],
+            "25": ["rds.DefaultMasterAdmin"],
             "26": [],
             "27": ["rds.StorageEncrypted"],
             "34": [],
@@ -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"]
         },