iam-policy-validator 1.0.4__py3-none-any.whl → 1.1.0__py3-none-any.whl

iam_validator/commands/validate.py

@@ -59,9 +59,9 @@ Examples:
         parser.add_argument(
             "--format",
             "-f",
-            choices=["console", "json", "markdown", "html", "csv", "sarif"],
+            choices=["console", "enhanced", "json", "markdown", "html", "csv", "sarif"],
             default="console",
-            help="Output format (default: console)",
+            help="Output format (default: console). Use 'enhanced' for modern visual output with Rich library",
         )
 
         parser.add_argument(
@@ -177,7 +177,8 @@ Examples:
         report = generator.generate_report(results)
 
         # Output results
-        if args.format == "console":
+        if args.format is None:
+            # Default: use classic console output (direct Rich printing)
             generator.print_console_report(report)
         elif args.format == "json":
             if args.output:
@@ -190,7 +191,7 @@ Examples:
             else:
                 print(generator.generate_github_comment(report))
         else:
-            # Use formatter registry for other formats (html, csv, sarif)
+            # Use formatter registry for other formats (enhanced, html, csv, sarif)
             output_content = generator.format_report(report, args.format)
             if args.output:
                 with open(args.output, "w", encoding="utf-8") as f:
@@ -285,6 +286,7 @@ Examples:
 
         # Output final results
         if args.format == "console":
+            # Classic console output (direct Rich printing from report.py)
             generator.print_console_report(report)
         elif args.format == "json":
             if args.output:
@@ -297,7 +299,7 @@ Examples:
             else:
                 print(generator.generate_github_comment(report))
         else:
-            # Use formatter registry for other formats (html, csv, sarif)
+            # Use formatter registry for other formats (enhanced, html, csv, sarif)
             output_content = generator.format_report(report, args.format)
             if args.output:
                 with open(args.output, "w", encoding="utf-8") as f:

iam_validator/core/config_loader.py

@@ -15,21 +15,57 @@ from typing import Any
 import yaml
 
 from iam_validator.core.check_registry import CheckConfig, CheckRegistry, PolicyCheck
+from iam_validator.core.defaults import get_default_config
 
 logger = logging.getLogger(__name__)
 
 
+def deep_merge(base: dict, override: dict) -> dict:
+    """
+    Deep merge two dictionaries, with override taking precedence.
+
+    Args:
+        base: Base dictionary with default values
+        override: Dictionary with override values
+
+    Returns:
+        Merged dictionary where override values take precedence
+    """
+    result = base.copy()
+    for key, value in override.items():
+        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+            result[key] = deep_merge(result[key], value)
+        else:
+            result[key] = value
+    return result
+
+
 class ValidatorConfig:
     """Main configuration object for the validator."""
 
-    def __init__(self, config_dict: dict[str, Any] | None = None):
+    def __init__(self, config_dict: dict[str, Any] | None = None, use_defaults: bool = True):
         """
         Initialize configuration from a dictionary.
 
         Args:
-            config_dict: Dictionary loaded from YAML config file
+            config_dict: Dictionary loaded from YAML config file.
+                        If None, either uses default configuration (if use_defaults=True)
+                        or creates an empty configuration (if use_defaults=False).
+                        If provided, merges with defaults (user config takes precedence).
+            use_defaults: Whether to load default configuration. Set to False for testing
+                         or when you want an empty configuration.
         """
-        self.config_dict = config_dict or {}
+        # Start with default configuration if requested
+        if use_defaults:
+            default_config = get_default_config()
+            # Merge user config with defaults if provided
+            if config_dict:
+                self.config_dict = deep_merge(default_config, config_dict)
+            else:
+                self.config_dict = default_config
+        else:
+            # No defaults - use provided config or empty dict
+            self.config_dict = config_dict or {}
 
         # Support both nested and flat structure
         # New flat structure: each check is a top-level key ending with "_check"

iam_validator/core/defaults.py

@@ -0,0 +1,304 @@
+"""
+Default configuration for IAM Policy Validator.
+
+This module contains the default configuration that is used when no user
+configuration file is provided. User configuration files will override
+these defaults.
+
+This configuration is synced with the default-config.yaml file.
+"""
+
+# ============================================================================
+# SEVERITY LEVELS
+# ============================================================================
+# The validator uses two types of severity levels:
+#
+# 1. IAM VALIDITY SEVERITIES (for AWS IAM policy correctness):
+#    - error:   Policy violates AWS IAM rules (invalid actions, ARNs, etc.)
+#    - warning: Policy may have IAM-related issues but is technically valid
+#    - info:    Informational messages about the policy structure
+#
+# 2. SECURITY SEVERITIES (for security best practices):
+#    - critical: Critical security risk (e.g., wildcard action + resource)
+#    - high:     High security risk (e.g., missing required conditions)
+#    - medium:   Medium security risk (e.g., overly permissive wildcards)
+#    - low:      Low security risk (e.g., minor best practice violations)
+#
+# Use 'error' for policy validity issues, and 'critical/high/medium/low' for
+# security best practices. This distinction helps separate "broken policies"
+# from "insecure but valid policies".
+# ============================================================================
+
+# Default configuration dictionary
+DEFAULT_CONFIG = {
+    "settings": {
+        "fail_fast": False,
+        "max_concurrent": 10,
+        "enable_builtin_checks": True,
+        "parallel_execution": True,
+        "cache_enabled": True,
+        "cache_directory": ".cache/aws_services",
+        "cache_ttl_hours": 24,
+        "fail_on_severity": ["error", "critical"],
+    },
+    "sid_uniqueness_check": {
+        "enabled": True,
+        "severity": "error",
+        "description": "Validates that Statement IDs (Sids) are unique within the policy",
+    },
+    "policy_size_check": {
+        "enabled": True,
+        "severity": "error",
+        "description": "Validates that IAM policies don't exceed AWS size limits",
+        "policy_type": "managed",
+    },
+    "action_validation_check": {
+        "enabled": True,
+        "severity": "error",
+        "description": "Validates that actions exist in AWS services",
+        "disable_wildcard_warnings": True,
+    },
+    "condition_key_validation_check": {
+        "enabled": True,
+        "severity": "error",
+        "description": "Validates condition keys against AWS service definitions",
+        "validate_aws_global_keys": True,
+    },
+    "resource_validation_check": {
+        "enabled": True,
+        "severity": "error",
+        "description": "Validates ARN format for resources",
+        "arn_pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-eusc|aws-iso|aws-iso-b|aws-iso-e|aws-iso-f):[a-z0-9\\-]+:[a-z0-9\\-*]*:[0-9*]*:.+$",
+    },
+    "security_best_practices_check": {
+        "enabled": True,
+        "description": "Checks for common security anti-patterns",
+        "wildcard_action_check": {
+            "enabled": True,
+            "severity": "medium",
+            "message": "Statement allows all actions (*)",
+            "suggestion": "Replace wildcard with specific actions needed for your use case",
+            "example": """Replace:
+  "Action": ["*"]
+
+With specific actions:
+  "Action": [
+    "s3:GetObject",
+    "s3:PutObject",
+    "s3:ListBucket"
+  ]
+""",
+        },
+        "wildcard_resource_check": {
+            "enabled": True,
+            "severity": "medium",
+            "message": "Statement applies to all resources (*)",
+            "suggestion": "Replace wildcard with specific resource ARNs",
+            "example": """Replace:
+  "Resource": "*"
+
+With specific ARNs:
+  "Resource": [
+    "arn:aws:service:region:account-id:resource-type/resource-id",
+    "arn:aws:service:region:account-id:resource-type/*"
+  ]
+""",
+        },
+        "full_wildcard_check": {
+            "enabled": True,
+            "severity": "critical",
+            "message": "Statement allows all actions on all resources - CRITICAL SECURITY RISK",
+            "suggestion": "This grants full administrative access. Replace both wildcards with specific actions and resources to follow least-privilege principle",
+            "example": """Replace:
+  "Action": "*",
+  "Resource": "*"
+
+With specific values:
+  "Action": [
+    "s3:GetObject",
+    "s3:PutObject"
+  ],
+  "Resource": [
+    "arn:aws:s3:::my-bucket/*"
+  ]
+""",
+        },
+        "service_wildcard_check": {
+            "enabled": True,
+            "severity": "high",
+            "allowed_services": ["logs", "cloudwatch"],
+        },
+        "sensitive_action_check": {
+            "enabled": True,
+            "severity": "medium",
+            "sensitive_actions": [
+                "iam:CreateUser",
+                "iam:CreateRole",
+                "iam:PutUserPolicy",
+                "iam:PutRolePolicy",
+                "iam:AttachUserPolicy",
+                "iam:AttachRolePolicy",
+                "iam:CreateAccessKey",
+                "iam:DeleteUser",
+                "iam:DeleteRole",
+                "s3:DeleteBucket",
+                "s3:PutBucketPolicy",
+                "s3:DeleteBucketPolicy",
+                "ec2:TerminateInstances",
+                "ec2:DeleteVolume",
+                "rds:DeleteDBInstance",
+                "lambda:DeleteFunction",
+                "eks:DeleteCluster",
+            ],
+            "sensitive_action_patterns": ["^iam:Delete.*"],
+        },
+    },
+    "action_condition_enforcement_check": {
+        "enabled": True,
+        "severity": "high",
+        "description": "Enforce specific IAM condition requirements (unified: MFA, IP, tags, etc.)",
+        "action_condition_requirements": [
+            {
+                "actions": ["iam:PassRole"],
+                "action_patterns": ["^iam:Pas?.*$"],
+                "severity": "high",
+                "required_conditions": [
+                    {
+                        "condition_key": "iam:PassedToService",
+                        "description": "Specify which AWS services are allowed to use the passed role to prevent privilege escalation",
+                        "example": """"Condition": {
+  "StringEquals": {
+    "iam:PassedToService": [
+      "lambda.amazonaws.com",
+      "ecs-tasks.amazonaws.com",
+      "ec2.amazonaws.com",
+      "glue.amazonaws.com",
+      "lambda.amazonaws.com"
+    ]
+  }
+}
+""",
+                    },
+                ],
+            },
+            {
+                "actions": [
+                    "iam:Create*",
+                    "iam:CreateRole",
+                    "iam:Put*Policy*",
+                    "iam:PutUserPolicy",
+                    "iam:PutRolePolicy",
+                    "iam:Attach*Policy*",
+                    "iam:AttachUserPolicy",
+                    "iam:AttachRolePolicy",
+                ],
+                "action_patterns": ["^iam:Create", "^iam:Put.*Policy", "^iam:Attach.*Policy"],
+                "severity": "high",
+                "required_conditions": [
+                    {
+                        "condition_key": "iam:PermissionsBoundary",
+                        "description": "Require permissions boundary for sensitive IAM operations to prevent privilege escalation",
+                        "expected_value": "arn:aws:iam::*:policy/DeveloperBoundary",
+                        "example": """# See: https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html
+"Condition": {
+  "StringEquals": {
+    "iam:PermissionsBoundary": "arn:aws:iam::123456789012:policy/XCompanyBoundaries"
+  }
+}
+""",
+                    },
+                ],
+            },
+            {
+                "actions": ["s3:DeleteBucket", "s3:DeleteBucketPolicy", "s3:PutBucketPolicy"],
+                "severity": "high",
+                "required_conditions": [
+                    {
+                        "condition_key": "aws:MultiFactorAuthPresent",
+                        "description": "Require MFA for S3 destructive operations",
+                        "expected_value": True,
+                    },
+                ],
+            },
+            {
+                "action_patterns": [
+                    "^ssm:StartSession$",
+                    "^ssm:Run.*$",
+                    "^s3:GetObject$",
+                    "^rds:.*$",
+                ],
+                "severity": "medium",
+                "required_conditions": [
+                    {
+                        "condition_key": "aws:SourceIp",
+                        "description": "Restrict access to corporate IP ranges",
+                        "example": """"Condition": {
+  "IpAddress": {
+    "aws:SourceIp": [
+      "10.0.0.0/8",
+      "172.16.0.0/12"
+    ]
+  }
+}
+""",
+                    },
+                ],
+            },
+            {
+                "actions": ["ec2:RunInstances"],
+                "required_conditions": {
+                    "all_of": [
+                        {
+                            "condition_key": "aws:ResourceTag/owner",
+                            "operator": "StringEquals",
+                            "expected_value": "${aws:PrincipalTag/owner}",
+                            "description": "Resource owner must match the principal's owner tag",
+                        },
+                        {
+                            "condition_key": "aws:RequestTag/env",
+                            "operator": "StringEquals",
+                            "expected_value": [
+                                "prod",
+                                "pre",
+                                "dev",
+                                "sandbox",
+                            ],
+                            "description": "Must specify a valid Environment tag",
+                        },
+                    ],
+                },
+            },
+            {
+                "action_patterns": ["^rds:Create.*", "^rds:Modify.*"],
+                "required_conditions": {
+                    "all_of": [
+                        {
+                            "condition_key": "aws:RequestTag/DataClassification",
+                            "description": "Must specify data classification",
+                        },
+                        {
+                            "condition_key": "aws:RequestTag/BackupPolicy",
+                            "description": "Must specify backup policy",
+                        },
+                        {
+                            "condition_key": "aws:RequestTag/Owner",
+                            "description": "Must specify resource owner",
+                        },
+                    ],
+                },
+            },
+        ],
+    },
+}
+
+
+def get_default_config() -> dict:
+    """
+    Get a deep copy of the default configuration.
+
+    Returns:
+        A deep copy of the default configuration dictionary
+    """
+    import copy
+
+    return copy.deepcopy(DEFAULT_CONFIG)

iam_validator/core/formatters/__init__.py

@@ -7,6 +7,7 @@ from iam_validator.core.formatters.base import (
 )
 from iam_validator.core.formatters.console import ConsoleFormatter
 from iam_validator.core.formatters.csv import CSVFormatter
+from iam_validator.core.formatters.enhanced import EnhancedFormatter
 from iam_validator.core.formatters.html import HTMLFormatter
 from iam_validator.core.formatters.json import JSONFormatter
 from iam_validator.core.formatters.markdown import MarkdownFormatter
@@ -17,6 +18,7 @@ __all__ = [
     "FormatterRegistry",
     "get_global_registry",
     "ConsoleFormatter",
+    "EnhancedFormatter",
     "JSONFormatter",
     "MarkdownFormatter",
     "SARIFFormatter",

iam_validator/core/formatters/console.py

@@ -1,11 +1,15 @@
-"""Console formatter - placeholder for existing functionality."""
+"""Console formatter - Classic console output using report.py."""
+
+from io import StringIO
+
+from rich.console import Console
 
 from iam_validator.core.formatters.base import OutputFormatter
 from iam_validator.core.models import ValidationReport
 
 
 class ConsoleFormatter(OutputFormatter):
-    """Console formatter using Rich library."""
+    """Classic console formatter - uses the standard report.py print_console_report output."""
 
     @property
     def format_id(self) -> str:
@@ -13,10 +17,43 @@ class ConsoleFormatter(OutputFormatter):
 
     @property
     def description(self) -> str:
-        return "Rich console output with colors and tables"
+        return "Classic console output with colors and tables"
 
     def format(self, report: ValidationReport, **kwargs) -> str:
-        """Format for console output."""
-        # This would integrate with existing Rich console output
-        # from iam_validator.core.report module
-        return "Console output (uses Rich library for terminal display)"
+        """Format validation report using the classic console output from report.py.
+
+        This delegates to the ReportGenerator.print_console_report method,
+        capturing its output to return as a string.
+
+        Args:
+            report: Validation report to format
+            **kwargs: Additional options (color: bool = True)
+
+        Returns:
+            Formatted string with classic console output
+        """
+        # Import here to avoid circular dependency
+        from iam_validator.core.report import ReportGenerator
+
+        # Allow disabling color for plain text output
+        color = kwargs.get("color", True)
+
+        # Capture the output from print_console_report
+        string_buffer = StringIO()
+        console = Console(file=string_buffer, force_terminal=color, width=120)
+
+        # Create a generator instance with our custom console
+        generator = ReportGenerator()
+
+        # Replace the console temporarily to capture output
+        original_console = generator.console
+        generator.console = console
+
+        # Call the actual print_console_report method
+        generator.print_console_report(report)
+
+        # Restore original console
+        generator.console = original_console
+
+        # Return captured output
+        return string_buffer.getvalue()

iam_validator/core/formatters/csv.py

@@ -68,9 +68,14 @@ class CSVFormatter(OutputFormatter):
         writer.writerow(["Summary Statistics"])
         writer.writerow(["Metric", "Value"])
         writer.writerow(["Total Policies", report.total_policies])
-        writer.writerow(["Valid Policies", report.valid_policies])
-        writer.writerow(["Invalid Policies", report.invalid_policies])
+        writer.writerow(["Valid Policies (IAM)", report.valid_policies])
+        writer.writerow(["Invalid Policies (IAM)", report.invalid_policies])
+        writer.writerow(["Policies with Security Findings", report.policies_with_security_issues])
         writer.writerow(["Total Issues", report.total_issues])
+        writer.writerow(["Validity Issues", report.validity_issues])
+        writer.writerow(["Security Issues", report.security_issues])
+        writer.writerow([""])
+        writer.writerow(["Legacy Severity Breakdown"])
         writer.writerow(["Errors", errors])
         writer.writerow(["Warnings", warnings])
         writer.writerow(["Info", infos])