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

iam_validator/core/formatters/enhanced.py

@@ -0,0 +1,428 @@
+"""Enhanced formatter - Rich-based console output with modern design."""
+
+from io import StringIO
+
+from rich.console import Console
+from rich.panel import Panel
+from rich.rule import Rule
+from rich.table import Table
+from rich.text import Text
+from rich.tree import Tree
+
+from iam_validator.core.formatters.base import OutputFormatter
+from iam_validator.core.models import PolicyValidationResult, ValidationReport
+
+
+class EnhancedFormatter(OutputFormatter):
+    """Enhanced console formatter with modern, visually rich output using Rich library."""
+
+    @property
+    def format_id(self) -> str:
+        return "enhanced"
+
+    @property
+    def description(self) -> str:
+        return "Enhanced console output with progress bars, tree structure, and rich visuals"
+
+    def format(self, report: ValidationReport, **kwargs) -> str:
+        """Format validation report as modern Rich console output.
+
+        This creates a visually enhanced string representation with:
+        - Gradient-styled headers
+        - Progress bars for validation metrics
+        - Tree structure for issues
+        - Bordered panels with icons
+
+        Args:
+            report: Validation report to format
+            **kwargs: Additional options (color: bool = True)
+
+        Returns:
+            Formatted string with ANSI codes for console display
+        """
+        # Allow disabling color for plain text output
+        color = kwargs.get("color", True)
+
+        # Use StringIO to capture Rich console output
+        string_buffer = StringIO()
+        console = Console(file=string_buffer, force_terminal=color, width=120)
+
+        # Header with title
+        console.print()
+        title = Text("IAM Policy Validation Report", style="bold cyan", justify="center")
+        console.print(Panel(title, border_style="bright_blue", padding=(1, 0)))
+        console.print()
+
+        # Executive Summary with progress bars
+        self._print_summary_panel(console, report)
+
+        # Severity breakdown if there are issues
+        if report.total_issues > 0:
+            console.print()
+            self._print_severity_breakdown(console, report)
+
+        console.print()
+        console.print(Rule(title="[bold]Detailed Results", style="bright_blue"))
+        console.print()
+
+        # Detailed results using tree structure
+        for idx, result in enumerate(report.results, 1):
+            self._format_policy_result_modern(console, result, idx, len(report.results))
+
+        # Final status with styled box
+        console.print()
+        self._print_final_status(console, report)
+
+        # Get the formatted output
+        output = string_buffer.getvalue()
+        string_buffer.close()
+
+        return output
+
+    def _print_summary_panel(self, console: Console, report: ValidationReport) -> None:
+        """Print summary panel with clean metrics display."""
+        # Create a simple table for metrics without progress bars
+        metrics_table = Table.grid(padding=(0, 2))
+        metrics_table.add_column(style="bold", justify="left", width=30)
+        metrics_table.add_column(style="bold", justify="left", width=20)
+
+        # Total policies
+        metrics_table.add_row(
+            "📋 Total Policies",
+            str(report.total_policies),
+        )
+
+        # Valid policies
+        if report.total_policies > 0:
+            valid_pct = report.valid_policies * 100 // report.total_policies
+            metrics_table.add_row(
+                "✅ Valid Policies",
+                f"[green]{report.valid_policies} ({valid_pct}%)[/green]",
+            )
+
+            # Invalid policies
+            invalid_pct = report.invalid_policies * 100 // report.total_policies
+            if report.invalid_policies > 0:
+                metrics_table.add_row(
+                    "❌ Invalid Policies",
+                    f"[red]{report.invalid_policies} ({invalid_pct}%)[/red]",
+                )
+            else:
+                metrics_table.add_row(
+                    "❌ Invalid Policies",
+                    f"[dim]{report.invalid_policies} ({invalid_pct}%)[/dim]",
+                )
+
+        # Total issues
+        if report.total_issues > 0:
+            metrics_table.add_row(
+                "⚠️  Total Issues Found",
+                f"[red]{report.total_issues}[/red]",
+            )
+        else:
+            metrics_table.add_row(
+                "⚠️  Total Issues Found",
+                f"[green]{report.total_issues}[/green]",
+            )
+
+        console.print(
+            Panel(
+                metrics_table,
+                title="📊 Executive Summary",
+                border_style="bright_blue",
+                padding=(1, 2),
+            )
+        )
+
+    def _create_progress_bar(self, value: int, total: int, color: str) -> str:
+        """Create a simple text-based progress bar."""
+        if total == 0:
+            return "[dim]───────────────────────[/dim]"
+
+        percentage = min(value * 100 // total, 100)
+        filled = int(percentage / 5)  # 20 bars total (100/5)
+        empty = 20 - filled
+
+        bar = f"[{color}]{'█' * filled}[/{color}][dim]{'░' * empty}[/dim]"
+        return bar
+
+    def _print_severity_breakdown(self, console: Console, report: ValidationReport) -> None:
+        """Print a clean breakdown of issues by severity."""
+        # Count issues by severity
+        severity_counts = {
+            "critical": 0,
+            "high": 0,
+            "error": 0,
+            "medium": 0,
+            "warning": 0,
+            "low": 0,
+            "info": 0,
+        }
+
+        for result in report.results:
+            for issue in result.issues:
+                severity = issue.severity.lower()
+                if severity in severity_counts:
+                    severity_counts[severity] += 1
+
+        # Create clean severity table
+        severity_table = Table.grid(padding=(0, 2))
+        severity_table.add_column(style="bold", justify="left", width=25)
+        severity_table.add_column(style="bold", justify="left", width=15)
+
+        # Show individual severity counts
+        if severity_counts["critical"] > 0:
+            severity_table.add_row(
+                "🔴 Critical",
+                f"[red]{severity_counts['critical']}[/red]",
+            )
+
+        if severity_counts["high"] > 0:
+            severity_table.add_row(
+                "🔴 High",
+                f"[red]{severity_counts['high']}[/red]",
+            )
+
+        if severity_counts["error"] > 0:
+            severity_table.add_row(
+                "🔴 Error",
+                f"[red]{severity_counts['error']}[/red]",
+            )
+
+        if severity_counts["medium"] > 0:
+            severity_table.add_row(
+                "🟡 Medium",
+                f"[yellow]{severity_counts['medium']}[/yellow]",
+            )
+
+        if severity_counts["warning"] > 0:
+            severity_table.add_row(
+                "🟡 Warning",
+                f"[yellow]{severity_counts['warning']}[/yellow]",
+            )
+
+        if severity_counts["low"] > 0:
+            severity_table.add_row(
+                "🔵 Low",
+                f"[blue]{severity_counts['low']}[/blue]",
+            )
+
+        if severity_counts["info"] > 0:
+            severity_table.add_row(
+                "🔵 Info",
+                f"[blue]{severity_counts['info']}[/blue]",
+            )
+
+        console.print(
+            Panel(severity_table, title="🎯 Issue Severity Breakdown", border_style="bright_blue")
+        )
+
+    def _format_policy_result_modern(
+        self, console: Console, result: PolicyValidationResult, idx: int, total: int
+    ) -> None:
+        """Format policy results with modern tree structure.
+
+        Args:
+            console: Rich console instance
+            result: Policy validation result
+            idx: Index of this policy (1-based)
+            total: Total number of policies
+        """
+        # Status icon and color
+        if result.is_valid and not result.issues:
+            icon = "✅"
+            color = "green"
+            status_text = "VALID"
+        elif result.is_valid and result.issues:
+            # Valid IAM policy but has security findings
+            # Check severity to determine the appropriate status
+            has_critical = any(i.severity in ("error", "critical", "high") for i in result.issues)
+            if has_critical:
+                icon = "⚠️"
+                color = "red"
+                status_text = "VALID (with security issues)"
+            else:
+                icon = "⚠️"
+                color = "yellow"
+                status_text = "VALID (with warnings)"
+        else:
+            # Policy failed validation (is_valid=false)
+            # Check if it's due to IAM errors or security issues
+            has_iam_errors = any(i.severity == "error" for i in result.issues)
+            has_security_critical = any(i.severity in ("critical", "high") for i in result.issues)
+
+            if has_iam_errors and has_security_critical:
+                # Both IAM errors and security issues
+                status_text = "INVALID (IAM errors + security issues)"
+            elif has_iam_errors:
+                # Only IAM validation errors
+                status_text = "INVALID (IAM errors)"
+            else:
+                # Only security issues (failed due to fail_on_severity config)
+                status_text = "FAILED (critical security issues)"
+
+            icon = "❌"
+            color = "red"
+
+        # Policy header
+        header = Text()
+        header.append(f"{icon} ", style=color)
+        header.append(f"[{idx}/{total}] ", style="dim")
+        header.append(result.policy_file, style=f"bold {color}")
+        header.append(f" • {status_text}", style=f"{color}")
+
+        if not result.issues:
+            console.print(header)
+            console.print("     [dim italic]No issues detected[/dim italic]")
+            console.print()
+            return
+
+        console.print(header)
+        console.print(f"     [dim]{len(result.issues)} issue(s) found[/dim]")
+        console.print()
+
+        # Create tree structure for issues
+        tree = Tree(f"[bold]Issues ({len(result.issues)})[/bold]", guide_style="bright_black")
+
+        # Group issues by severity with proper categorization
+        critical_issues = [i for i in result.issues if i.severity == "critical"]
+        high_issues = [i for i in result.issues if i.severity == "high"]
+        error_issues = [i for i in result.issues if i.severity == "error"]
+        medium_issues = [i for i in result.issues if i.severity == "medium"]
+        warning_issues = [i for i in result.issues if i.severity == "warning"]
+        low_issues = [i for i in result.issues if i.severity == "low"]
+        info_issues = [i for i in result.issues if i.severity == "info"]
+
+        # Add critical issues (security checks)
+        if critical_issues:
+            critical_branch = tree.add("🔴 [bold red]Critical[/bold red]")
+            for issue in critical_issues:
+                self._add_issue_to_tree(critical_branch, issue, "red")
+
+        # Add high severity issues (security checks)
+        if high_issues:
+            high_branch = tree.add("🔴 [bold red]High[/bold red]")
+            for issue in high_issues:
+                self._add_issue_to_tree(high_branch, issue, "red")
+
+        # Add errors (IAM validation)
+        if error_issues:
+            error_branch = tree.add("🔴 [bold red]Error[/bold red]")
+            for issue in error_issues:
+                self._add_issue_to_tree(error_branch, issue, "red")
+
+        # Add medium severity issues (security checks)
+        if medium_issues:
+            medium_branch = tree.add("🟡 [bold yellow]Medium[/bold yellow]")
+            for issue in medium_issues:
+                self._add_issue_to_tree(medium_branch, issue, "yellow")
+
+        # Add warnings (IAM validation)
+        if warning_issues:
+            warning_branch = tree.add("🟡 [bold yellow]Warning[/bold yellow]")
+            for issue in warning_issues:
+                self._add_issue_to_tree(warning_branch, issue, "yellow")
+
+        # Add low severity issues (security checks)
+        if low_issues:
+            low_branch = tree.add("🔵 [bold blue]Low[/bold blue]")
+            for issue in low_issues:
+                self._add_issue_to_tree(low_branch, issue, "blue")
+
+        # Add info (IAM validation)
+        if info_issues:
+            info_branch = tree.add("🔵 [bold blue]Info[/bold blue]")
+            for issue in info_issues:
+                self._add_issue_to_tree(info_branch, issue, "blue")
+
+        console.print("   ", tree)
+        console.print()
+
+    def _add_issue_to_tree(self, branch: Tree, issue, color: str) -> None:
+        """Add an issue to a tree branch."""
+        # Build location string
+        location = f"Statement {issue.statement_index}"
+        if issue.statement_sid:
+            location = f"{issue.statement_sid} (#{issue.statement_index})"
+        if issue.line_number is not None:
+            location += f" @L{issue.line_number}"
+
+        # Issue summary
+        issue_text = Text()
+        issue_text.append(f"[{location}] ", style="dim")
+        issue_text.append(issue.issue_type, style=f"bold {color}")
+        issue_node = branch.add(issue_text)
+
+        # Message
+        msg_node = issue_node.add(Text(issue.message, style="white"))
+
+        # Details
+        if issue.action or issue.resource or issue.condition_key:
+            details = []
+            if issue.action:
+                details.append(f"Action: {issue.action}")
+            if issue.resource:
+                details.append(f"Resource: {issue.resource}")
+            if issue.condition_key:
+                details.append(f"Condition: {issue.condition_key}")
+            msg_node.add(Text(" • ".join(details), style="dim cyan"))
+
+        # Suggestion
+        if issue.suggestion:
+            suggestion_text = Text()
+            suggestion_text.append("💡 ", style="yellow")
+            suggestion_text.append(issue.suggestion, style="italic yellow")
+            msg_node.add(suggestion_text)
+
+    def _print_final_status(self, console: Console, report: ValidationReport) -> None:
+        """Print final status panel."""
+        if report.invalid_policies == 0 and report.total_issues == 0:
+            # Perfect success
+            status = Text("🎉 ALL POLICIES VALIDATED SUCCESSFULLY! 🎉", style="bold green")
+            message = Text(
+                f"All {report.valid_policies} policies passed validation with no issues.",
+                style="green",
+            )
+            border_color = "green"
+        elif report.invalid_policies == 0:
+            # Valid IAM policies but may have security findings
+            # Check if there are critical/high security issues
+            has_critical = any(
+                i.severity in ("error", "critical", "high")
+                for r in report.results
+                for i in r.issues
+            )
+
+            if has_critical:
+                status = Text("⚠️ All Policies Valid (with security issues)", style="bold red")
+                message = Text(
+                    f"{report.valid_policies} policies are valid, but {report.total_issues} "
+                    f"security issue(s) were found that must be addressed.",
+                    style="red",
+                )
+                border_color = "red"
+            else:
+                status = Text("✅ All Policies Valid (with warnings)", style="bold yellow")
+                message = Text(
+                    f"{report.valid_policies} policies are valid, but {report.total_issues} "
+                    f"warning(s) were found that should be reviewed.",
+                    style="yellow",
+                )
+                border_color = "yellow"
+        else:
+            # Has invalid policies
+            status = Text("❌ VALIDATION FAILED", style="bold red")
+            message = Text(
+                f"{report.invalid_policies} of {report.total_policies} policies have critical "
+                f"issues that must be resolved.",
+                style="red",
+            )
+            border_color = "red"
+
+        # Combine status and message
+        final_text = Text()
+        final_text.append(status)
+        final_text.append("\n\n")
+        final_text.append(message)
+
+        console.print(Panel(final_text, border_style=border_color, padding=(1, 2)))

iam_validator/core/formatters/html.py

@@ -228,21 +228,43 @@ class HTMLFormatter(OutputFormatter):
             text-transform: uppercase;
         }
 
+        /* IAM Validity Severities */
         .severity-error {
-            background: var(--error-color);
+            background: #dc3545;
             color: white;
         }
 
         .severity-warning {
-            background: var(--warning-color);
+            background: #ffc107;
             color: #333;
         }
 
         .severity-info {
-            background: var(--info-color);
+            background: #0dcaf0;
             color: white;
         }
 
+        /* Security Severities */
+        .severity-critical {
+            background: #8b0000;
+            color: white;
+        }
+
+        .severity-high {
+            background: #ff6b6b;
+            color: white;
+        }
+
+        .severity-medium {
+            background: #ffa500;
+            color: #333;
+        }
+
+        .severity-low {
+            background: #90caf9;
+            color: #333;
+        }
+
         .chart-container {
             position: relative;
             height: 300px;
@@ -296,19 +318,6 @@ class HTMLFormatter(OutputFormatter):
 
     def _render_summary(self, report: ValidationReport, include_charts: bool) -> str:
         """Render summary section with statistics."""
-        # Count issues by severity - support both IAM validity and security severities
-        error_count = sum(
-            1
-            for r in report.results
-            for i in r.issues
-            if i.severity in ("error", "critical", "high")
-        )
-        warning_count = sum(
-            1 for r in report.results for i in r.issues if i.severity in ("warning", "medium")
-        )
-        info_count = sum(
-            1 for r in report.results for i in r.issues if i.severity in ("info", "low")
-        )
         total_issues = report.total_issues
 
         html_parts = [
@@ -321,24 +330,28 @@ class HTMLFormatter(OutputFormatter):
                     <div class="stat-label">Total Policies</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value">{report.valid_policies}</div>
-                    <div class="stat-label">Valid Policies</div>
+                    <div class="stat-value" style="color: var(--success-color)">{report.valid_policies}</div>
+                    <div class="stat-label">Valid (IAM)</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value">{total_issues}</div>
-                    <div class="stat-label">Total Issues</div>
+                    <div class="stat-value" style="color: var(--error-color)">{report.invalid_policies}</div>
+                    <div class="stat-label">Invalid (IAM)</div>
+                </div>
+                <div class="stat-card">
+                    <div class="stat-value" style="color: var(--warning-color)">{report.policies_with_security_issues}</div>
+                    <div class="stat-label">Security Findings</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value" style="color: var(--error-color)">{error_count}</div>
-                    <div class="stat-label">Errors</div>
+                    <div class="stat-value">{total_issues}</div>
+                    <div class="stat-label">Total Issues</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value" style="color: var(--warning-color)">{warning_count}</div>
-                    <div class="stat-label">Warnings</div>
+                    <div class="stat-value" style="color: var(--error-color)">{report.validity_issues}</div>
+                    <div class="stat-label">Validity Issues</div>
                 </div>
                 <div class="stat-card">
-                    <div class="stat-value" style="color: var(--info-color)">{info_count}</div>
-                    <div class="stat-label">Info</div>
+                    <div class="stat-value" style="color: var(--warning-color)">{report.security_issues}</div>
+                    <div class="stat-label">Security Issues</div>
                 </div>
             </div>
         """
@@ -370,9 +383,17 @@ class HTMLFormatter(OutputFormatter):
                     <label for="severityFilter">Severity</label>
                     <select id="severityFilter">
                         <option value="">All</option>
-                        <option value="error">Errors</option>
-                        <option value="warning">Warnings</option>
-                        <option value="info">Info</option>
+                        <optgroup label="IAM Validity">
+                            <option value="error">Error</option>
+                            <option value="warning">Warning</option>
+                            <option value="info">Info</option>
+                        </optgroup>
+                        <optgroup label="Security">
+                            <option value="critical">Critical</option>
+                            <option value="high">High</option>
+                            <option value="medium">Medium</option>
+                            <option value="low">Low</option>
+                        </optgroup>
                     </select>
                 </div>
                 <div class="filter-group">
@@ -391,11 +412,38 @@ class HTMLFormatter(OutputFormatter):
         </section>
         """
 
+    def _format_suggestion(self, suggestion: str) -> str:
+        """Format suggestion field to show examples in code blocks."""
+        if not suggestion:
+            return "-"
+
+        # Check if suggestion contains "Example:" section
+        if "\nExample:\n" in suggestion:
+            parts = suggestion.split("\nExample:\n", 1)
+            text_part = html.escape(parts[0])
+            code_part = html.escape(parts[1])
+
+            return f"""
+                <div>
+                    <div>{text_part}</div>
+                    <details style="margin-top: 10px;">
+                        <summary style="cursor: pointer; font-weight: 500; color: var(--text-secondary);">
+                            📖 View Example
+                        </summary>
+                        <pre class="code-block" style="margin-top: 10px; white-space: pre-wrap;">{code_part}</pre>
+                    </details>
+                </div>
+            """
+        else:
+            return html.escape(suggestion)
+
     def _render_issues_table(self, report: ValidationReport) -> str:
         """Render issues table."""
         rows = []
         for policy_result in report.results:
             for issue in policy_result.issues:
+                formatted_suggestion = self._format_suggestion(issue.suggestion)
+
                 row = f"""
                 <tr class="issue-row"
                     data-severity="{issue.severity}"
@@ -407,7 +455,7 @@ class HTMLFormatter(OutputFormatter):
                     <td><span class="severity-badge severity-{issue.severity}">{issue.severity}</span></td>
                     <td>{html.escape(issue.issue_type or "-")}</td>
                     <td>{html.escape(issue.message)}</td>
-                    <td>{html.escape(issue.suggestion or "-")}</td>
+                    <td>{formatted_suggestion}</td>
                 </tr>
                 """
                 rows.append(row)
@@ -519,21 +567,63 @@ class HTMLFormatter(OutputFormatter):
             if (typeof Chart !== 'undefined') {
                 const ctx = document.getElementById('severityChart');
                 if (ctx) {
+                    // Count all severity types
+                    const criticalCount = document.querySelectorAll('[data-severity="critical"]').length;
+                    const highCount = document.querySelectorAll('[data-severity="high"]').length;
+                    const mediumCount = document.querySelectorAll('[data-severity="medium"]').length;
+                    const lowCount = document.querySelectorAll('[data-severity="low"]').length;
                     const errorCount = document.querySelectorAll('[data-severity="error"]').length;
                     const warningCount = document.querySelectorAll('[data-severity="warning"]').length;
                     const infoCount = document.querySelectorAll('[data-severity="info"]').length;
 
+                    // Build labels and data arrays dynamically
+                    const labels = [];
+                    const data = [];
+                    const colors = [];
+
+                    if (criticalCount > 0) {
+                        labels.push('Critical');
+                        data.push(criticalCount);
+                        colors.push('rgba(139, 0, 0, 0.8)');
+                    }
+                    if (highCount > 0) {
+                        labels.push('High');
+                        data.push(highCount);
+                        colors.push('rgba(255, 107, 107, 0.8)');
+                    }
+                    if (errorCount > 0) {
+                        labels.push('Error');
+                        data.push(errorCount);
+                        colors.push('rgba(220, 53, 69, 0.8)');
+                    }
+                    if (mediumCount > 0) {
+                        labels.push('Medium');
+                        data.push(mediumCount);
+                        colors.push('rgba(255, 165, 0, 0.8)');
+                    }
+                    if (warningCount > 0) {
+                        labels.push('Warning');
+                        data.push(warningCount);
+                        colors.push('rgba(255, 193, 7, 0.8)');
+                    }
+                    if (infoCount > 0) {
+                        labels.push('Info');
+                        data.push(infoCount);
+                        colors.push('rgba(13, 202, 240, 0.8)');
+                    }
+                    if (lowCount > 0) {
+                        labels.push('Low');
+                        data.push(lowCount);
+                        colors.push('rgba(144, 202, 249, 0.8)');
+                    }
+
                     new Chart(ctx, {
                         type: 'doughnut',
                         data: {
-                            labels: ['Errors', 'Warnings', 'Info'],
+                            labels: labels,
                             datasets: [{
-                                data: [errorCount, warningCount, infoCount],
-                                backgroundColor: [
-                                    'rgba(220, 53, 69, 0.8)',
-                                    'rgba(255, 193, 7, 0.8)',
-                                    'rgba(13, 202, 240, 0.8)'
-                                ]
+                                data: data,
+                                backgroundColor: colors
                             }]
                         },
                         options: {