sec-report-kit 0.2.7__tar.gz → 0.2.9__tar.gz

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.2.9 - 2026-05-18
+
+### Changed
+- `srk render consolidated` now works from raw JSON/SARIF inputs alone and automatically generates the per-tool HTML reports it embeds in the dashboard.
+- The consolidated renderer now defaults `--output` to the input folder when the option is omitted.
+
+### Fixed
+- Consolidated auto-detection no longer misclassifies Bandit JSON as Semgrep, restoring correct per-tool totals and severity counts.
+
+## 0.2.8 - 2026-05-17
+
+### Changed
+- Consolidated report helpers now force the workspace `src/` directory onto `PYTHONPATH` so the generated HTML uses the current source tree.
+
+### Fixed
+- The consolidated dashboard footer now shows the requested `sec-report-kit` repository link and developer LinkedIn link.
+
 ## 0.2.7 - 2026-05-17
 
 ### Added

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sec-report-kit
-Version: 0.2.7
+Version: 0.2.9
 Summary: Generate HTML security reports from Trivy, pip-audit, Safety, Bandit, and Gitleaks JSON
 Author: Ravi Konduru
 License: MIT
@@ -89,6 +89,14 @@ srk render consolidated --input security_reports --output security_reports --tar
 ```
 
 This command writes `consolidated-security-report.html` to the output folder.
+If `--output` is omitted, it defaults to the same folder passed to `--input`.
+The consolidated renderer reads raw JSON/SARIF inputs, generates the per-tool HTML reports automatically, and then links/embeds those generated HTML files in the dashboard. You do not need to pre-render individual HTML reports first.
+
+Example with implicit output folder:
+
+```bash
+srk render consolidated --input security_reports --target sec-report-kit
+```
 
 ## Helper Scripts (bat/sh)
 

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/README.md

@@ -62,6 +62,14 @@ srk render consolidated --input security_reports --output security_reports --tar
 ```
 
 This command writes `consolidated-security-report.html` to the output folder.
+If `--output` is omitted, it defaults to the same folder passed to `--input`.
+The consolidated renderer reads raw JSON/SARIF inputs, generates the per-tool HTML reports automatically, and then links/embeds those generated HTML files in the dashboard. You do not need to pre-render individual HTML reports first.
+
+Example with implicit output folder:
+
+```bash
+srk render consolidated --input security_reports --target sec-report-kit
+```
 
 ## Helper Scripts (bat/sh)
 

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sec-report-kit"
-version = "0.2.7"
+version = "0.2.9"
 description = "Generate HTML security reports from Trivy, pip-audit, Safety, Bandit, and Gitleaks JSON"
 readme = "README.md"
 requires-python = ">=3.10"

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/scripts/render_consolidated_html.bat

@@ -3,6 +3,7 @@ setlocal
 
 set "PYTHON_BIN=python"
 if exist "%~dp0..\.venv\Scripts\python.exe" set "PYTHON_BIN=%~dp0..\.venv\Scripts\python.exe"
+set "PYTHONPATH=%~dp0..\src;%PYTHONPATH%"
 
 set "REPORT_DIR=%~1"
 if "%REPORT_DIR%"=="" set "REPORT_DIR=security_reports"

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/scripts/render_consolidated_html.sh

@@ -5,6 +5,7 @@ PYTHON_BIN="${PYTHON_BIN:-python}"
 if [[ -x "$(dirname "$0")/../.venv/bin/python" ]]; then
   PYTHON_BIN="$(dirname "$0")/../.venv/bin/python"
 fi
+export PYTHONPATH="$(dirname "$0")/../src${PYTHONPATH:+:$PYTHONPATH}"
 
 REPORT_DIR="${1:-security_reports}"
 ROOT_NAME="$(basename "$(cd "$(dirname "$0")/.." && pwd)")"

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/src/sec_report_kit/__init__.py

@@ -1,4 +1,4 @@
 """sec_report_kit package."""
 
 __all__ = ["__version__"]
-__version__ = "0.2.7"
+__version__ = "0.2.9"

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/src/sec_report_kit/cli.py

@@ -29,6 +29,21 @@ app.add_typer(render_app, name="render")
 app.add_typer(mcp_app, name="mcp")
 
 
+_CONSOLIDATED_TOOL_OUTPUT_FILES = {
+    "pip-audit": "pip-audit-report.html",
+    "trivy": "trivy-report.html",
+    "gitleaks": "gitleaks-report.html",
+    "safety": "safety-report.html",
+    "bandit": "bandit-report.html",
+    "semgrep": "semgrep-report.html",
+    "codeql": "codeql-report.html",
+    "osv-scanner": "osv-scanner-report.html",
+    "checkov": "checkov-report.html",
+    "tfsec": "tfsec-report.html",
+    "trufflehog": "trufflehog-report.html",
+}
+
+
 def _parse_modified_since(value: str) -> dt.datetime:
     local_tz = dt.datetime.now().astimezone().tzinfo or dt.timezone.utc
     now = dt.datetime.now(local_tz)
@@ -173,6 +188,23 @@ def _write_report(source_label: str, target_ref: str, input_path: Path, output_p
     typer.echo(f"[INFO] Severity counts: {counts}")
 
 
+def _write_consolidated_tool_reports(output_dir: Path, target_ref: str, findings_by_parser: dict[str, list[Any]]) -> None:
+    for parser, findings in findings_by_parser.items():
+        output_name = _CONSOLIDATED_TOOL_OUTPUT_FILES.get(parser)
+        if output_name is None:
+            continue
+
+        sorted_findings = sort_findings(findings)
+        counts = count_by_severity(sorted_findings)
+        report_html = render_html_report(
+            target_ref=target_ref,
+            source_label=parser,
+            findings=sorted_findings,
+            counts=counts,
+        )
+        (output_dir / output_name).write_text(report_html, encoding="utf-8")
+
+
 @render_app.command("trivy")
 def render_trivy(
     input: Path = typer.Option(..., "--input", exists=True, dir_okay=False, file_okay=True, readable=True),
@@ -304,12 +336,14 @@ def render_consolidated(
         readable=True,
         help="Folder containing scanner JSON/SARIF report files",
     ),
-    output: Path = typer.Option(
-        ...,
+    output: Path | None = typer.Option(
+        None,
         "--output",
         dir_okay=True,
         file_okay=False,
-        help="Output folder where consolidated HTML will be written",
+        prompt="Output folder for consolidated report",
+        prompt_required=False,
+        help="Output folder where consolidated HTML will be written (defaults to --input when omitted)",
     ),
     target: str = typer.Option("consolidated-scan", "--target", help="Consolidated target label"),
     modified_since: str | None = typer.Option(
@@ -330,6 +364,9 @@ def render_consolidated(
     ),
 ) -> None:
     """Render a consolidated HTML report from all supported report files in a directory."""
+    if output is None:
+        output = input
+
     candidates = _collect_consolidated_candidates(
         input_dir=input,
         modified_since=modified_since,
@@ -338,6 +375,8 @@ def render_consolidated(
     )
 
     all_findings = []
+    findings_by_parser: dict[str, list[Any]] = {}
+    included_sources: set[str] = set()
     included_files = 0
     skipped_files = 0
     for report_file in candidates:
@@ -346,23 +385,31 @@ def render_consolidated(
             parser = detect_source_type(payload)
             findings = _parse_findings(payload, parser)
             all_findings.extend(findings)
+            findings_by_parser.setdefault(parser, []).extend(findings)
+            included_sources.add(parser)
             included_files += 1
             typer.echo(f"[INFO] Included {report_file.name} as {parser} ({len(findings)} findings)")
         except Exception as exc:
             skipped_files += 1
             typer.echo(f"[WARN] Skipping {report_file.name}: {exc}")
 
+    output.mkdir(parents=True, exist_ok=True)
+    _write_consolidated_tool_reports(output, target, findings_by_parser)
+
     all_findings = sort_findings(all_findings)
     counts = count_by_severity(all_findings)
+    since_dt = _parse_modified_since(modified_since) if modified_since else None
+    until_dt = _parse_modified_until(modified_until) if modified_until else None
     report_html = render_consolidated_dashboard_report(
         target_ref=target,
         findings=all_findings,
         counts=counts,
         reports_dir=input,
         output_dir=output,
+        modified_since=since_dt,
+        modified_until=until_dt,
+        included_sources=included_sources,
     )
-
-    output.mkdir(parents=True, exist_ok=True)
     output_file = output / "consolidated-security-report.html"
     output_file.write_text(report_html, encoding="utf-8")
 

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/src/sec_report_kit/parsers/__init__.py

@@ -61,10 +61,25 @@ def detect_source_type(data: dict | list) -> str:
             ):
                 return "trufflehog"
         if "results" in data and isinstance(data.get("results"), list):
-            if "errors" in data or "paths" in data or "version" in data:
+            sample = data["results"][0] if data["results"] else {}
+            if isinstance(sample, dict) and (
+                "check_id" in sample
+                or (
+                    "extra" in sample
+                    and isinstance(sample.get("extra"), dict)
+                    and ("severity" in sample["extra"] or "message" in sample["extra"])
+                )
+            ):
                 return "semgrep"
             if all(isinstance(item, dict) and "rule_id" in item for item in data.get("results", [])):
                 return "tfsec"
+            if isinstance(sample, dict) and (
+                "issue_severity" in sample
+                or "issue_text" in sample
+                or "test_id" in sample
+                or "test_name" in sample
+            ):
+                return "bandit"
             return "bandit"
         if "findings" in data and isinstance(data.get("findings"), list):
             return "gitleaks"

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/src/sec_report_kit/report/html_renderer.py

@@ -24,12 +24,27 @@ def _count_severities(findings: list[Finding]) -> dict[str, int]:
   return counted
 
 
-def _find_first_existing(base_dirs: list[Path], file_names: list[str]) -> Path | None:
+def _find_first_existing(
+  base_dirs: list[Path],
+  file_names: list[str],
+  modified_since: dt.datetime | None = None,
+  modified_until: dt.datetime | None = None,
+) -> Path | None:
   for file_name in file_names:
     for base in base_dirs:
       candidate = base / file_name
-      if candidate.exists() and candidate.is_file():
-        return candidate
+      if not (candidate.exists() and candidate.is_file()):
+        continue
+      if modified_since is not None or modified_until is not None:
+        mtime = dt.datetime.fromtimestamp(
+          candidate.stat().st_mtime,
+          tz=(modified_since or modified_until).tzinfo,  # type: ignore[union-attr]
+        )
+        if modified_since is not None and mtime < modified_since:
+          continue
+        if modified_until is not None and mtime > modified_until:
+          continue
+      return candidate
   return None
 
 
@@ -44,6 +59,9 @@ def render_consolidated_dashboard_report(
   counts: dict[str, int],
   reports_dir: Path,
   output_dir: Path,
+  modified_since: dt.datetime | None = None,
+  modified_until: dt.datetime | None = None,
+  included_sources: set[str] | None = None,
 ) -> str:
   generated_at = dt.datetime.now(dt.timezone.utc).isoformat()
 
@@ -132,22 +150,38 @@ def render_consolidated_dashboard_report(
     normalized_key = _normalize_tool_key(item.source_type)
     normalized_findings.setdefault(normalized_key, []).append(item)
 
+  normalized_included_sources = {
+    _normalize_tool_key(source)
+    for source in (included_sources or set())
+  }
+  filtered_mode = modified_since is not None or modified_until is not None
+
   base_dirs = [reports_dir]
   if output_dir != reports_dir:
     base_dirs.append(output_dir)
 
   tool_rows: list[dict[str, object]] = []
   for spec in tool_specs:
-    matched_file = _find_first_existing(base_dirs, spec["report_files"])
+    matched_file = _find_first_existing(
+      base_dirs,
+      spec["report_files"],
+      modified_since=modified_since,
+      modified_until=modified_until,
+    )
     source_findings = normalized_findings.get(spec["key"], [])
     source_counts = _count_severities(source_findings)
+    available = matched_file is not None
+    if filtered_mode:
+      # In filtered runs, only show embedded tool HTML if that tool had at least one
+      # source file included in the filtered candidate set.
+      available = available and spec["key"] in normalized_included_sources
     tool_rows.append(
       {
         "key": spec["key"],
         "name": spec["name"],
         "subtitle": spec["subtitle"],
         "run_hint": spec["run_hint"],
-        "available": matched_file is not None,
+        "available": available,
         "href": _to_href(output_dir, matched_file) if matched_file else "",
         "total": len(source_findings),
         "critical": source_counts["CRITICAL"],
@@ -336,7 +370,7 @@ footer {{
 <main class="page">
   <section class="hero">
   <h1>Security Audit Consolidated Dashboard</h1>
-  <div class="hero-meta">Generated: {_esc(generated_at)} | Reports available: {reports_available}/{reports_total} | Target: {_esc(target_ref)}</div>
+  <div class="hero-meta">Generated: {_esc(generated_at)} | Reports available: {reports_available}/{reports_total} | Target: {_esc(target_ref)}{(' | Since: ' + _esc(modified_since.strftime('%Y-%m-%d %H:%M'))) if modified_since else ''}{(' | Until: ' + _esc(modified_until.strftime('%Y-%m-%d %H:%M'))) if modified_until else ''}</div>
   <div class="summary">
     <div class="summary-card"><span class="label">Total Findings</span><span class="value">{len(findings)}</span></div>
     <div class="summary-card"><span class="label">Critical</span><span class="value">{counts['CRITICAL']}</span></div>
@@ -360,8 +394,7 @@ footer {{
   </section>
 
   <footer>
-  <p>This consolidated dashboard embeds tool-specific HTML reports when available.</p>
-  <p>Generate missing tool HTML files using the corresponding scripts in the scripts folder.</p>
+  <p>This report is generated by <a href="https://github.com/ShanKonduru/sec-report-kit" target="_blank" rel="noopener noreferrer">sec-report-kit utility</a> &nbsp;|&nbsp; Connect with the developer: <a href="https://www.linkedin.com/in/shankonduru/" target="_blank" rel="noopener noreferrer">Shan Konduru</a></p>
   </footer>
 </main>
 </body>
@@ -561,12 +594,7 @@ def render_html_report(target_ref: str, source_label: str, findings: list[Findin
   </script>
 
   <footer class="report-footer">
-    This report is generated by
-    <a href="https://github.com/ShanKonduru/sec-report-kit" target="_blank" rel="noopener noreferrer">sec-report-kit</a>
-    utility
-    &nbsp;|&nbsp;
-    Connect with the developer:
-    <a href="https://www.linkedin.com/in/shankonduru/" target="_blank" rel="noopener noreferrer">Shan Konduru</a>
+    This report is generated by <a href="https://github.com/ShanKonduru/sec-report-kit" target="_blank" rel="noopener noreferrer">sec-report-kit utility</a> &nbsp;|&nbsp; Connect with the developer: <a href="https://www.linkedin.com/in/shankonduru/" target="_blank" rel="noopener noreferrer">Shan Konduru</a>
   </footer>
 </body>
 </html>

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/tests/test_cli.py

@@ -438,14 +438,20 @@ def test_render_consolidated_command_from_directory(tmp_path):
     )
 
     output_file = output_dir / "consolidated-security-report.html"
+    bandit_report = output_dir / "bandit-report.html"
+    trivy_report = output_dir / "trivy-report.html"
     assert result.exit_code == 0
     assert output_file.exists()
+    assert bandit_report.exists()
+    assert trivy_report.exists()
     html = output_file.read_text()
     assert "Security Audit Consolidated Dashboard" in html
     assert "Reports available:" in html
     assert "Target: repo-root" in html
     assert "Bandit" in html
     assert "Trivy" in html
+    assert 'src="bandit-report.html"' in html
+    assert 'src="trivy-report.html"' in html
 
 
 def test_render_consolidated_command_empty_or_unsupported_directory(tmp_path):
@@ -503,6 +509,8 @@ def test_render_consolidated_command_modified_since_filters_candidates(tmp_path)
     assert "Included trivy.json" in result.output
     assert "Included bandit.json" not in result.output
     assert "Files included: 1" in result.output
+    assert (output_dir / "trivy-report.html").exists()
+    assert not (output_dir / "bandit-report.html").exists()
 
 
 def test_render_consolidated_command_modified_until_filters_candidates(tmp_path):

{sec_report_kit-0.2.7 → sec_report_kit-0.2.9}/tests/test_html_renderer.py

@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import datetime as dt
+
 from sec_report_kit.models import Finding
 from sec_report_kit.report.html_renderer import render_consolidated_dashboard_report, render_html_report
 
@@ -31,9 +35,10 @@ def test_render_html_with_finding_with_url():
     assert "https://example.com" in html
     assert "openssl" in html
     assert "This report is generated by" in html
-    assert ">sec-report-kit<" in html
+    assert "sec-report-kit utility" in html
     assert "Connect with the developer:" in html
     assert ">Shan Konduru<" in html
+    assert "https://github.com/ShanKonduru/sec-report-kit" in html
     assert "https://www.linkedin.com/in/shankonduru/" in html
 
 
@@ -144,6 +149,9 @@ def test_render_consolidated_dashboard_with_available_and_missing_reports(tmp_pa
     assert "Bandit Report" in html
     assert "Trivy Report" in html
     assert "Reports available:" in html
+    assert "This report is generated by" in html
+    assert "sec-report-kit utility" in html
+    assert "Connect with the developer:" in html
 
 
 def test_render_consolidated_dashboard_shows_all_tools_when_no_visible_tools(tmp_path):
@@ -164,3 +172,69 @@ def test_render_consolidated_dashboard_shows_all_tools_when_no_visible_tools(tmp
     assert "GitLeaks Report" in html
     assert "TruffleHog Report" in html
     assert "Generate this report first using scripts/render_trivy_html.sh or scripts/render_trivy_html.bat." in html
+
+
+def test_render_consolidated_dashboard_date_filter_excludes_old_html_files(tmp_path):
+    """HTML report files outside the date range must not appear as 'available'."""
+    reports_dir = tmp_path / "reports"
+    output_dir = reports_dir
+    reports_dir.mkdir()
+
+    # Write a bandit HTML file and backdate its mtime to 2000-01-01
+    bandit_html = reports_dir / "bandit-report.html"
+    bandit_html.write_text("<html>bandit</html>", encoding="utf-8")
+    old_mtime = dt.datetime(2000, 1, 1, tzinfo=dt.timezone.utc).timestamp()
+    import os
+    os.utime(bandit_html, (old_mtime, old_mtime))
+
+    # Write a trivy HTML file with a very-future mtime (3000-01-01)
+    trivy_html = reports_dir / "trivy-report.html"
+    trivy_html.write_text("<html>trivy</html>", encoding="utf-8")
+    future_mtime = dt.datetime(3000, 1, 1, tzinfo=dt.timezone.utc).timestamp()
+    os.utime(trivy_html, (future_mtime, future_mtime))
+
+    tz = dt.timezone.utc
+    since = dt.datetime(2026, 1, 1, tzinfo=tz)
+    until = dt.datetime(2026, 12, 31, 23, 59, 59, tzinfo=tz)
+
+    html = render_consolidated_dashboard_report(
+        target_ref="repo",
+        findings=[],
+        counts={"CRITICAL": 0, "HIGH": 0, "MEDIUM": 0, "LOW": 0, "UNKNOWN": 0},
+        reports_dir=reports_dir,
+        output_dir=output_dir,
+        modified_since=since,
+        modified_until=until,
+    )
+
+    # Bandit HTML is from 2000 (before since) — must NOT be shown as available
+    assert 'src="../reports/bandit-report.html"' not in html
+    assert 'src="bandit-report.html"' not in html
+    # Trivy HTML is from 3000 (after until) — must NOT be shown as available
+    assert 'src="trivy-report.html"' not in html
+    # Since and until labels should appear in the hero
+    assert "Since: 2026-01-01" in html
+    assert "Until: 2026-12-31" in html
+
+
+def test_render_consolidated_dashboard_filtered_mode_requires_included_source(tmp_path):
+    reports_dir = tmp_path / "reports"
+    reports_dir.mkdir()
+
+    bandit_html = reports_dir / "bandit-report.html"
+    bandit_html.write_text("<html>bandit</html>", encoding="utf-8")
+
+    html = render_consolidated_dashboard_report(
+        target_ref="repo",
+        findings=[],
+        counts={"CRITICAL": 0, "HIGH": 0, "MEDIUM": 0, "LOW": 0, "UNKNOWN": 0},
+        reports_dir=reports_dir,
+        output_dir=reports_dir,
+        modified_since=dt.datetime(2026, 5, 17, tzinfo=dt.timezone.utc),
+        modified_until=dt.datetime(2026, 5, 20, 23, 59, 59, tzinfo=dt.timezone.utc),
+        included_sources=set(),
+    )
+
+    assert "Reports available: 0/11" in html
+    assert 'src="bandit-report.html"' not in html
+    assert "Tool report not found" in html