aws-cis-controls-assessment 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

aws_cis_assessment/__init__.py

@@ -6,6 +6,6 @@ CIS Controls Implementation Groups (IG1, IG2, IG3). Implements 145 comprehensive
 across all implementation groups for complete security compliance assessment.
 """
 
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 __author__ = "AWS CIS Assessment Team"
 __description__ = "Production-ready AWS CIS Controls Compliance Assessment Framework"

aws_cis_assessment/controls/ig1/control_critical_security.py

@@ -32,24 +32,31 @@ class RootAccountHardwareMFAEnabledAssessment(BaseConfigRuleAssessment):
         try:
             iam_client = aws_factory.get_client('iam', region)
             
-            # Get account summary which includes MFA device count
+            # Get account summary which includes MFA device count for root
             account_summary = iam_client.get_account_summary()
+            summary_map = account_summary.get('SummaryMap', {})
             
-            # List MFA devices for root account (empty user name for root)
-            mfa_devices = iam_client.list_mfa_devices()
-            
-            # Get virtual MFA devices to differentiate from hardware
-            virtual_mfa_devices = iam_client.list_virtual_mfa_devices()
+            # Get virtual MFA devices to check if root has hardware MFA
+            # Virtual MFA devices can be listed without specifying a user
+            try:
+                virtual_mfa_devices = iam_client.list_virtual_mfa_devices()
+                virtual_mfa_list = virtual_mfa_devices.get('VirtualMFADevices', [])
+            except ClientError as e:
+                logger.warning(f"Could not list virtual MFA devices: {e}")
+                virtual_mfa_list = []
             
             return [{
                 'account_id': aws_factory.account_id,
-                'account_summary': account_summary.get('SummaryMap', {}),
-                'mfa_devices': mfa_devices.get('MFADevices', []),
-                'virtual_mfa_devices': virtual_mfa_devices.get('VirtualMFADevices', [])
+                'account_summary': summary_map,
+                'virtual_mfa_devices': virtual_mfa_list
             }]
             
         except ClientError as e:
-            logger.error(f"Error getting root account MFA configuration: {e}")
+            error_code = e.response.get('Error', {}).get('Code', '')
+            if error_code in ['AccessDenied', 'UnauthorizedOperation']:
+                logger.warning(f"Insufficient permissions to check root account MFA: {e}")
+            else:
+                logger.error(f"Error getting root account MFA configuration: {e}")
             return []
         except Exception as e:
             logger.error(f"Unexpected error in root account MFA check: {e}")
@@ -59,15 +66,15 @@ class RootAccountHardwareMFAEnabledAssessment(BaseConfigRuleAssessment):
         """Evaluate root account hardware MFA compliance."""
         try:
             account_summary = resource.get('account_summary', {})
-            mfa_devices = resource.get('mfa_devices', [])
             virtual_mfa_devices = resource.get('virtual_mfa_devices', [])
+            account_id = resource.get('account_id', 'unknown')
             
             # Check if root account has any MFA devices
             account_mfa_enabled = account_summary.get('AccountMFAEnabled', 0)
             
             if account_mfa_enabled == 0:
                 return ComplianceResult(
-                    resource_id=resource['account_id'],
+                    resource_id=account_id,
                     resource_type="AWS::IAM::Root",
                     compliance_status=ComplianceStatus.NON_COMPLIANT,
                     evaluation_reason="Root account does not have MFA enabled",
@@ -75,42 +82,32 @@ class RootAccountHardwareMFAEnabledAssessment(BaseConfigRuleAssessment):
                     region=region
                 )
             
-            # Check if there are any MFA devices for root (empty UserName indicates root)
-            root_mfa_devices = [device for device in mfa_devices if not device.get('UserName')]
-            
-            if not root_mfa_devices:
-                return ComplianceResult(
-                    resource_id=resource['account_id'],
-                    resource_type="AWS::IAM::Root",
-                    compliance_status=ComplianceStatus.NON_COMPLIANT,
-                    evaluation_reason="Root account MFA is enabled but no MFA devices found",
-                    config_rule_name=self.rule_name,
-                    region=region
-                )
-            
-            # Check if any of the root MFA devices are hardware (not virtual)
-            virtual_mfa_serial_numbers = {device.get('SerialNumber') for device in virtual_mfa_devices}
-            
-            hardware_mfa_devices = [
-                device for device in root_mfa_devices 
-                if device.get('SerialNumber') not in virtual_mfa_serial_numbers
+            # Check if root has a virtual MFA device
+            # Virtual MFA devices for root have SerialNumber like: arn:aws:iam::ACCOUNT_ID:mfa/root-account-mfa-device
+            root_virtual_mfa = [
+                device for device in virtual_mfa_devices 
+                if 'root-account-mfa-device' in device.get('SerialNumber', '').lower()
+                or device.get('User', {}).get('Arn', '').endswith(':root')
             ]
             
-            if not hardware_mfa_devices:
+            if root_virtual_mfa:
                 return ComplianceResult(
-                    resource_id=resource['account_id'],
+                    resource_id=account_id,
                     resource_type="AWS::IAM::Root",
                     compliance_status=ComplianceStatus.NON_COMPLIANT,
-                    evaluation_reason="Root account only has virtual MFA devices, hardware MFA required",
+                    evaluation_reason="Root account has virtual MFA enabled, hardware MFA required for enhanced security",
                     config_rule_name=self.rule_name,
                     region=region
                 )
             
+            # If MFA is enabled but no virtual MFA found, assume hardware MFA
+            # Note: We cannot definitively verify hardware MFA without root credentials,
+            # but if AccountMFAEnabled=1 and no virtual MFA exists, it's likely hardware
             return ComplianceResult(
-                resource_id=resource['account_id'],
+                resource_id=account_id,
                 resource_type="AWS::IAM::Root",
                 compliance_status=ComplianceStatus.COMPLIANT,
-                evaluation_reason=f"Root account has {len(hardware_mfa_devices)} hardware MFA device(s) enabled",
+                evaluation_reason="Root account has MFA enabled (likely hardware MFA - no virtual MFA detected)",
                 config_rule_name=self.rule_name,
                 region=region
             )

{aws_cis_controls_assessment-1.0.6.dist-info → aws_cis_controls_assessment-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aws-cis-controls-assessment
-Version: 1.0.6
+Version: 1.0.7
 Summary: Production-ready AWS CIS Controls compliance assessment framework with 145 comprehensive rules
 Author-email: AWS CIS Assessment Team <security@example.com>
 Maintainer-email: AWS CIS Assessment Team <security@example.com>

{aws_cis_controls_assessment-1.0.6.dist-info → aws_cis_controls_assessment-1.0.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-aws_cis_assessment/__init__.py,sha256=ENW-oYsdAEpNlcdVOswJHLtIyWLwm1qKC0CaFVObN4Q,480
+aws_cis_assessment/__init__.py,sha256=MIb9QxlByRyGULow2iCQGagEILhZIrW3eYXu0sNMrR8,480
 aws_cis_assessment/cli/__init__.py,sha256=DYaGVAIoy5ucs9ubKQxX6Z3ZD46AGz9AaIaDQXzrzeY,100
 aws_cis_assessment/cli/examples.py,sha256=F9K2Fe297kUfwoq6Ine9Aj_IXNU-KwO9hd7SAPWeZHI,12884
 aws_cis_assessment/cli/main.py,sha256=i5QoqHXsPG_Kw0W7jM3Zj2YaAaCJnxxnfz82QBBHq-U,49441
@@ -20,7 +20,7 @@ aws_cis_assessment/controls/ig1/control_access_keys.py,sha256=Hj3G0Qpwa2EcJE-u49
 aws_cis_assessment/controls/ig1/control_advanced_security.py,sha256=cSbgwEKVuqBq9_YoAC30OSiBrDOmpPaOUNJSa9udOUQ,24250
 aws_cis_assessment/controls/ig1/control_backup_recovery.py,sha256=Y5za_4lCZmA5MYhHp4OCGyL4z97cj6dbO0KfabQ5Hr0,21465
 aws_cis_assessment/controls/ig1/control_cloudtrail_logging.py,sha256=lQOjshW8BBymvzphtWuwg4wIyv6nH2mOSiogBe_Ejfo,8514
-aws_cis_assessment/controls/ig1/control_critical_security.py,sha256=ixUhwM7USK6nur4C1iZNOtRASNomLNggSglQw8qZRAg,20926
+aws_cis_assessment/controls/ig1/control_critical_security.py,sha256=1MVMkfOAWcH5ppFv7psZvJvcOtpww6Pl5WFXrMyN158,20942
 aws_cis_assessment/controls/ig1/control_data_protection.py,sha256=-EDT-d0IcYpdv4cYSNfsSKwX7YzKZ9MiVY18-6YHcVE,44216
 aws_cis_assessment/controls/ig1/control_iam_advanced.py,sha256=FQA_8IV5CyD_49u0eLN8q-JM50g1-tilDu9Ww_R3o9s,27694
 aws_cis_assessment/controls/ig1/control_iam_governance.py,sha256=msaqmhLlFYK3pMgC-eYOP7RvDCpx014W8Su6hdlQ_Ic,22079
@@ -61,7 +61,7 @@ aws_cis_assessment/reporters/base_reporter.py,sha256=xalVCTpNzSrTcfZmyRL2I-3B6dd
 aws_cis_assessment/reporters/csv_reporter.py,sha256=r83xzfP1t5AO9MfKawgN4eTeOU6eGZwJQgvNDLEd7NI,31419
 aws_cis_assessment/reporters/html_reporter.py,sha256=1MdbKQ8Eujc0B6x_toHmr3WupjgfTpNzSYwLNFWxzW8,81712
 aws_cis_assessment/reporters/json_reporter.py,sha256=MObCzTc9nlGTEXeWc7P8tTMeKCpEaJNfcSYc79cHXhc,22250
-aws_cis_controls_assessment-1.0.6.dist-info/licenses/LICENSE,sha256=T_p0qKH4RoI3ejr3tktf3rx2Zart_9KeUmJd5iiqXW8,1079
+aws_cis_controls_assessment-1.0.7.dist-info/licenses/LICENSE,sha256=T_p0qKH4RoI3ejr3tktf3rx2Zart_9KeUmJd5iiqXW8,1079
 deprecation-package/aws_cis_assessment_deprecated/__init__.py,sha256=WOaufqanKNhvWQ3frj8e627tS_kZnyk2R2hwqPFqydw,1892
 docs/README.md,sha256=lZNUghM9wgl1uW8OoVHpxt5ugKB6DL0rqx_hVTx8yZc,4152
 docs/assessment-logic.md,sha256=7t1YPkLPI3-MpvF3cLpO4x4LeNMfM950-es4vn0W4Zc,27123
@@ -71,8 +71,8 @@ docs/developer-guide.md,sha256=uC0DvgmBoOQ2LnBNManTe_rdOccvjWbzvqd93huO4jE,31026
 docs/installation.md,sha256=ELCw7jhvtbavzL18sitbpi02We-_qB4sg8t3jKBy5cw,7481
 docs/troubleshooting.md,sha256=JcYw6qS9G9YsM0MxxxZUGfPZmmZBxDYTV8tAIK0Sa2U,13175
 docs/user-guide.md,sha256=8XZpgnDTMBFc1s3nR__9GnwjRqPnSXAYBDow3586OcQ,9927
-aws_cis_controls_assessment-1.0.6.dist-info/METADATA,sha256=wRved3YCBUAXrbjjmyO-ZR4kpj9E4h0hUnvRz4JztME,11290
-aws_cis_controls_assessment-1.0.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-aws_cis_controls_assessment-1.0.6.dist-info/entry_points.txt,sha256=-AxPn5Y7yau0pQh33F5_uyWfvcnm2Kg1_nMQuLrZ7SY,68
-aws_cis_controls_assessment-1.0.6.dist-info/top_level.txt,sha256=4OHmV6RAEWkz-Se50kfmuGCd-mUSotDZz3iLGF9CmkI,44
-aws_cis_controls_assessment-1.0.6.dist-info/RECORD,,
+aws_cis_controls_assessment-1.0.7.dist-info/METADATA,sha256=TzjkiiU1ZdPb-rqfbL9NkJTsWHqyC4C7d7a_ojR-fVg,11290
+aws_cis_controls_assessment-1.0.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aws_cis_controls_assessment-1.0.7.dist-info/entry_points.txt,sha256=-AxPn5Y7yau0pQh33F5_uyWfvcnm2Kg1_nMQuLrZ7SY,68
+aws_cis_controls_assessment-1.0.7.dist-info/top_level.txt,sha256=4OHmV6RAEWkz-Se50kfmuGCd-mUSotDZz3iLGF9CmkI,44
+aws_cis_controls_assessment-1.0.7.dist-info/RECORD,,