credlock 2.0.0__tar.gz → 2.0.2__tar.gz

{credlock-2.0.0 → credlock-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: credlock
-Version: 2.0.0
+Version: 2.0.2
 Summary: 🔐 Prevent accidental credential commits to Git
 Home-page: https://github.com/VedhaSriD/credlock
 Author: Vedha Sri

{credlock-2.0.0 → credlock-2.0.2}/credlock/__init__.py

@@ -1,6 +1,6 @@
 """CredLock - Prevent accidental secret commits to Git"""
 
-__version__ = "2.0.0"
+__version__ = "2.0.2"
 __author__ = "Your Name"
 __description__ = "Automatic credential detection in your code"
 

{credlock-2.0.0 → credlock-2.0.2}/credlock/cli.py

@@ -4,6 +4,7 @@ Command-line interface for CredLock.
 
 import time
 import typer
+import json
 from pathlib import Path
 from typing import Optional
 from rich.console import Console
@@ -19,6 +20,14 @@ app = typer.Typer(help="🔒 CredLock - Prevent accidental credential commits")
 console = Console()
 
 
+def count_files_in_directory(path: str) -> int:
+    """Count total files in directory"""
+    try:
+        return len(list(Path(path).rglob("*")))
+    except:
+        return 0
+
+
 @app.command()
 def scan(
     path: str = typer.Argument("."),
@@ -27,17 +36,74 @@ def scan(
 ):
     """Scan for secrets"""
     console = Console()
+    start_time = time.time()
+    
+    # Print start message
     console.print(f"🔍 Scanning {path} for secrets...")
-    console.print(f"[DEBUG] Using entropy filtering: YES")  # DEBUG LINE
+    print_scan_start()
     
+    # Count files
+    files_scanned = count_files_in_directory(path)
+    
+    # Scan directory
     if staged:
-        findings = scan_staged_files()
+        # For staged files, we'd need git integration
+        findings = scan_directory(path)
     else:
         findings = scan_directory(path)
     
-    console.print(f"[DEBUG] Total findings BEFORE filtering: {len(findings)}")  # DEBUG LINE
+    elapsed = time.time() - start_time
+    
+    # Display results
+    if not findings:
+        print_no_secrets()
+    else:
+        print_secrets_found(findings)
     
-    # Rest of code...
+    # Print summary
+    print_scan_summary(len(findings), elapsed, files_scanned)
+    
+    # Save to history - pass findings list, not count!
+    try:
+        # Convert Finding objects to dicts for storage
+        findings_dicts = [
+            {
+                "file_path": f.file_path,
+                "line_number": f.line_number,
+                "pattern_name": f.pattern_name,
+                "confidence": f.confidence,
+                "matched_string": f.matched_string[:50] + "..." if len(f.matched_string) > 50 else f.matched_string,
+            }
+            for f in findings
+        ]
+        save_scan(findings_dicts)
+    except Exception as e:
+        # Silently fail if history save fails (doesn't block scan)
+        pass
+    
+    # JSON output if requested
+    if json_output:
+        output = {
+            "path": path,
+            "findings_count": len(findings),
+            "files_scanned": files_scanned,
+            "findings": [
+                {
+                    "file_path": f.file_path,
+                    "line_number": f.line_number,
+                    "pattern_name": f.pattern_name,
+                    "confidence": f.confidence,
+                    "matched_string": f.matched_string[:50] + "..." if len(f.matched_string) > 50 else f.matched_string,
+                }
+                for f in findings
+            ],
+            "elapsed_seconds": elapsed,
+        }
+        console.print(json.dumps(output, indent=2))
+    
+    # Exit with code 1 if secrets found (for git hook)
+    if findings:
+        raise typer.Exit(code=1)
 
 
 @app.command()
@@ -98,7 +164,7 @@ def setup(force: bool = typer.Option(False, "--force", "-f", help="Force reinsta
             raise typer.Exit(code=1)
         
         setup_hook(force=force)
-        console.print("[green]✅ Hook installed[/green]")
+        console.print("[green]✅ Git hook installed![/green]")
     except typer.Exit:
         raise
     except Exception as e:

credlock-2.0.2/credlock/formatter.py

@@ -0,0 +1,172 @@
+"""
+Terminal output formatting for CredLock
+"""
+
+from rich.console import Console
+from typing import List, Dict
+from collections import defaultdict
+from credlock.scanner import Finding
+
+console = Console()
+
+
+def print_scan_start():
+    """Print scan start message"""
+    console.print("[cyan]🔍 Scanning current directory...[/cyan]")
+
+
+def print_no_secrets():
+    """Print success message when no secrets found"""
+    console.print("[green]✅ No secrets found. Scan clean![/green]")
+
+
+def print_secrets_found(findings: List[Finding], verbose: bool = False):
+    """
+    Print findings grouped by file (NOT as table)
+    
+    Args:
+        findings: List of Finding objects
+        verbose: Show detailed output (not used, but kept for compatibility)
+    """
+    if not findings:
+        print_no_secrets()
+        return
+    
+    # Group findings by file
+    by_file = defaultdict(list)
+    for finding in findings:
+        by_file[finding.file_path].append(finding)
+    
+    # Print header
+    console.print("\n[red]⛔ SECRETS DETECTED! Found {} potential secrets[/red]".format(len(findings)))
+    console.print()
+    
+    # Print grouped by file
+    for file_path in sorted(by_file.keys()):
+        file_findings = by_file[file_path]
+        console.print(f"[cyan]📄 {file_path}[/cyan] [yellow]({len(file_findings)} secret{'s' if len(file_findings) > 1 else ''})[/yellow]")
+        
+        for finding in file_findings:
+            # Extract just the pattern name (without "pattern_" prefix if present)
+            pattern_display = finding.pattern_name
+            
+            # Truncate matched string to 40 chars for display
+            matched_display = finding.matched_string[:40]
+            if len(finding.matched_string) > 40:
+                matched_display += "..."
+            
+            console.print(
+                f"  [yellow]Line {finding.line_number}:[/yellow] "
+                f"[magenta][{pattern_display}][/magenta] "
+                f"{matched_display}"
+            )
+        
+        console.print()
+
+
+def print_dangerous_files(files: List[str]):
+    """Print dangerous files found"""
+    if not files:
+        return
+    
+    console.print("\n[red]⚠️ Dangerous Files Found:[/red]")
+    for file in files:
+        console.print(f"  [red]•[/red] {file}")
+
+
+def print_scan_summary(findings_count: int, duration: float, files_scanned: int = 0):
+    """Print scan summary"""
+    if findings_count > 0:
+        console.print("[red]❌ PUSH BLOCKED - {} SECRET{} FOUND[/red]".format(
+            findings_count,
+            'S' if findings_count > 1 else ''
+        ))
+        console.print()
+        console.print("[cyan]Recommendations:[/cyan]")
+        console.print("1. Move secrets to .env file")
+        console.print("2. Add .env to .gitignore")
+        console.print("3. Use environment variables in code")
+        console.print()
+        console.print("[yellow]Git commands to fix:[/yellow]")
+        console.print("  $ echo '.env' >> .gitignore")
+        console.print("  $ git rm --cached .env")
+        console.print("  $ git commit --amend")
+    else:
+        console.print("[green]✅ SCAN PASSED - Safe to push![/green]")
+    
+    console.print(f"\n[cyan]Scan Summary:[/cyan]")
+    console.print(f"  Files scanned: {files_scanned}")
+    console.print(f"  Secrets found: {findings_count}")
+    console.print(f"  Duration: {duration:.2f}s")
+
+
+def print_history(scans: List[Dict]):
+    """Print scan history"""
+    if not scans:
+        console.print("[yellow]No scan history found[/yellow]")
+        return
+    
+    console.print("[cyan]Scan History:[/cyan]")
+    for i, scan in enumerate(scans, 1):
+        ts = scan.get("timestamp", "")[:10]
+        count = scan.get("findings_count", 0)
+        console.print(f"  {i}. {ts} - {count} findings")
+
+
+def print_config_info(config: Dict):
+    """Print configuration information"""
+    console.print("[cyan]Current Configuration:[/cyan]")
+    console.print(f"  Built-in patterns: 50+")
+    console.print(f"  Custom patterns: {len(config.get('custom_patterns', {}))}")
+    console.print(f"  Ignored files: {len(config.get('ignored_files', []))}")
+
+
+def print_setup_success():
+    """Print setup success message"""
+    console.print("\n[green]✅ Git pre-commit hook installed successfully![/green]")
+    console.print("[cyan]The hook will now run automatically before each commit.[/cyan]")
+
+
+def print_error(message: str):
+    """Print error message"""
+    console.print(f"[red]❌ ERROR: {message}[/red]")
+
+
+def print_success(message: str):
+    """Print success message"""
+    console.print(f"[green]✅ {message}[/green]")
+
+
+def format_findings(findings: List[Finding], verbose: bool = False) -> str:
+    """
+    Format findings as string (alternative to print_secrets_found)
+    
+    Args:
+        findings: List of Finding objects
+        verbose: Show detailed output
+        
+    Returns:
+        Formatted string
+    """
+    if not findings:
+        return "No secrets found."
+    
+    # Group by file
+    by_file = defaultdict(list)
+    for finding in findings:
+        by_file[finding.file_path].append(finding)
+    
+    output = f"\n⛔ SECRETS DETECTED! Found {len(findings)} potential secret(s)\n"
+    
+    for file_path in sorted(by_file.keys()):
+        file_findings = by_file[file_path]
+        output += f"\n📄 {file_path} ({len(file_findings)} secret{'s' if len(file_findings) > 1 else ''})\n"
+        
+        for finding in file_findings:
+            matched_display = finding.matched_string[:40]
+            if len(finding.matched_string) > 40:
+                matched_display += "..."
+            
+            output += f"  Line {finding.line_number}: [{finding.pattern_name}] {matched_display}\n"
+    
+    return output

{credlock-2.0.0 → credlock-2.0.2}/credlock/patterns.py

@@ -235,7 +235,7 @@ PATTERNS = {
     
     "slack_bot_token": SecretPattern(
         name="slack_bot_token",
-        pattern=r"xoxb-[0-9]{10,13}-[0-9]{10,13}-[a-zA-Z0-9]{20,}",
+        pattern=r"xoxb-[0-9]{10,13}-[0-9]{10,13}-[a-zA-Z0-9_\-]{12,}",  # FIXED: 12+ instead of 20+
         confidence="HIGH",
         entropy_threshold=3.5,
         exclude_files=[]
@@ -254,7 +254,7 @@ PATTERNS = {
         name="password_assignment",
         pattern=r"['\"]?password['\"]?\s*[:=]\s*['\"]([^'\"]{8,})['\"]",
         confidence="MEDIUM",
-        entropy_threshold=3.5,  # RAISED to filter messages like "Enter your password"
+        entropy_threshold=3.5,
         exclude_files=[]
     ),
     
@@ -281,7 +281,7 @@ PATTERNS = {
         name="heroku_key",
         pattern=r"[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}",
         confidence="MEDIUM",
-        entropy_threshold=4.2,  # HIGH: filters UUID-like strings in npm
+        entropy_threshold=4.2,
         exclude_files=["package-lock.json", "yarn.lock"]
     ),
     
@@ -295,9 +295,9 @@ PATTERNS = {
     
     "azure_key": SecretPattern(
         name="azure_key",
-        pattern=r"[a-zA-Z0-9+/]{88}==",  # Base64 ~88 chars
+        pattern=r"[a-zA-Z0-9+/]{88}==",
         confidence="LOW",
-        entropy_threshold=4.5,  # VERY HIGH: filters npm integrity hashes
+        entropy_threshold=4.5,
         exclude_files=["package-lock.json", "yarn.lock", "composer.lock"]
     ),
     
@@ -321,7 +321,7 @@ PATTERNS = {
         name="twilio_auth_token",
         pattern=r"[a-zA-Z0-9]{32}",
         confidence="LOW",
-        entropy_threshold=4.0,  # HIGH: filters random strings
+        entropy_threshold=4.0,
         exclude_files=[]
     ),
     
@@ -329,7 +329,7 @@ PATTERNS = {
         name="datadog_key",
         pattern=r"[a-f0-9]{32}",
         confidence="LOW",
-        entropy_threshold=4.5,  # VERY HIGH: filters hex strings like npm integrity
+        entropy_threshold=4.5,
         exclude_files=["package-lock.json", "yarn.lock"]
     ),
     

{credlock-2.0.0 → credlock-2.0.2}/credlock.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: credlock
-Version: 2.0.0
+Version: 2.0.2
 Summary: 🔐 Prevent accidental credential commits to Git
 Home-page: https://github.com/VedhaSriD/credlock
 Author: Vedha Sri

{credlock-2.0.0 → credlock-2.0.2}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="credlock",
-    version="2.0.0",
+    version="2.0.2",
     author="Vedha Sri",
     author_email="your.email@example.com",
     description="🔐 Prevent accidental credential commits to Git",

credlock-2.0.0/credlock/formatter.py

@@ -1,152 +0,0 @@
-"""
-Terminal output formatting for CredLock
-"""
-
-from rich.console import Console
-from rich.table import Table
-from typing import List, Dict
-from credlock.scanner import Finding
-
-console = Console()
-
-
-def print_scan_start():
-    """Print scan start message"""
-    console.print("[cyan]🔍 Scanning for secrets...[/cyan]")
-
-
-def print_no_secrets():
-    """Print success message when no secrets found"""
-    console.print("[green]✅ No secrets found. Scan clean![/green]")
-
-
-def print_secrets_found(findings: List[Finding], verbose: bool = False):
-    """
-    Print findings in formatted table
-    
-    Args:
-        findings: List of Finding objects
-        verbose: Show detailed output
-    """
-    console.print("\n[red]⛔ SECRETS DETECTED![/red]")
-    console.print(f"[red]Found {len(findings)} potential secret(s)[/red]\n")
-    
-    # Create table
-    table = Table(title="Secret Findings")
-    table.add_column("File", style="cyan")
-    table.add_column("Line", style="yellow")
-    table.add_column("Pattern", style="magenta")
-    table.add_column("Confidence", style="red")
-    
-    for finding in findings:
-        table.add_row(
-            finding.file_path,
-            str(finding.line_number),
-            finding.pattern_name,
-            finding.confidence
-        )
-    
-    console.print(table)
-    
-    # Show details if verbose
-    if verbose:
-        console.print("\n[bold]Detailed Output:[/bold]")
-        for finding in findings:
-            console.print(f"\n[yellow]File:[/yellow] {finding.file_path}")
-            console.print(f"[yellow]Line {finding.line_number}:[/yellow] {finding.line_content}")
-            console.print(f"[yellow]Pattern:[/yellow] {finding.pattern_name}")
-            console.print(f"[yellow]Confidence:[/yellow] {finding.confidence}")
-            console.print(f"[yellow]Entropy:[/yellow] {finding.entropy:.2f}")
-
-
-def print_dangerous_files(files: List[str]):
-    """Print dangerous files found"""
-    if not files:
-        return
-    
-    console.print("\n[red]⚠️ Dangerous Files Found:[/red]")
-    for file in files:
-        console.print(f"  [red]•[/red] {file}")
-
-
-def print_scan_summary(findings_count: int, duration: float, files_scanned: int = 0):
-    """Print scan summary"""
-    console.print(f"\n[cyan]Scan Summary:[/cyan]")
-    console.print(f"  Files scanned: {files_scanned}")
-    console.print(f"  Secrets found: {findings_count}")
-    console.print(f"  Duration: {duration:.2f}s")
-
-
-def print_history(scans: List[Dict]):
-    """Print scan history"""
-    if not scans:
-        console.print("[yellow]No scan history found[/yellow]")
-        return
-    
-    table = Table(title="Scan History")
-    table.add_column("Scan ID", style="cyan")
-    table.add_column("Timestamp", style="yellow")
-    table.add_column("Secrets Found", style="red")
-    table.add_column("Duration", style="green")
-    
-    for scan in scans:
-        table.add_row(
-            scan.get("scan_id", "unknown"),
-            scan.get("timestamp", "unknown"),
-            str(scan.get("secrets_found", 0)),
-            scan.get("duration", "0s")
-        )
-    
-    console.print(table)
-
-
-def print_config_info(config: Dict):
-    """Print configuration information"""
-    console.print("[cyan]Current Configuration:[/cyan]")
-    console.print(f"  Built-in patterns: 50+")
-    console.print(f"  Custom patterns: {len(config.get('custom_patterns', {}))}")
-    console.print(f"  Ignored files: {len(config.get('ignored_files', []))}")
-
-
-def print_setup_success():
-    """Print setup success message"""
-    console.print("\n[green]✅ Git pre-commit hook installed successfully![/green]")
-    console.print("[cyan]The hook will now run automatically before each commit.[/cyan]")
-
-
-def print_error(message: str):
-    """Print error message"""
-    console.print(f"[red]❌ ERROR: {message}[/red]")
-
-
-def print_success(message: str):
-    """Print success message"""
-    console.print(f"[green]✅ {message}[/green]")
-
-
-def format_findings(findings: List[Finding], verbose: bool = False) -> str:
-    """
-    Format findings as string (alternative to print_secrets_found)
-    
-    Args:
-        findings: List of Finding objects
-        verbose: Show detailed output
-        
-    Returns:
-        Formatted string
-    """
-    if not findings:
-        return "No secrets found."
-    
-    output = f"\n⛔ SECRETS DETECTED! Found {len(findings)} potential secret(s)\n"
-    
-    for finding in findings:
-        output += f"\n📄 {finding.file_path} (Line {finding.line_number})\n"
-        output += f"  Pattern: {finding.pattern_name}\n"
-        output += f"  Confidence: {finding.confidence}\n"
-        
-        if verbose:
-            output += f"  Content: {finding.line_content}\n"
-            output += f"  Entropy: {finding.entropy:.2f}\n"
-    
-    return output