Skip to content

Merge stable into dev (resolve conflicts for #3079)#3198

Merged
liquidsec merged 23 commits into
devfrom
dev-stable-conflict-resolver
Jun 17, 2026
Merged

Merge stable into dev (resolve conflicts for #3079)#3198
liquidsec merged 23 commits into
devfrom
dev-stable-conflict-resolver

Conversation

@liquidsec

Copy link
Copy Markdown
Collaborator

Summary

  • Merges stable into dev to resolve the 17 merge conflicts blocking PR Dev -> Stable 3.0 #3079 (Dev -> Stable 3.0)
  • All conflicts resolved in favor of dev (3.0 codebase), except:
    • CLA workflow: kept blacklanternsecurity/CLA/ path (matches badsecrets main)
    • Trufflehog version bump (3.90.8 -> 3.95.5) and Python min version docs (3.9 -> 3.10) from stable incorporated
    • Release history entries for 2.8.1-2.8.5 from stable incorporated
    • Duplicate TestBadSecrets_JWTIdentifyOnly class from stable removed (references httpx and VULNERABILITY, both replaced in dev)

Once merged, #3079 should become a clean merge.

aconite33 and others added 23 commits June 12, 2026 16:43
Replaces the full inline CLA workflow with a thin caller that references
the reusable workflow in blacklanternsecurity/.github. CLA logic is now
maintained in one place across all BLS repos.

This also fixes the bug where org members (e.g. liquidsec) were flagged
as unsigned when they committed to an external contributor's PR (#3144).

Depends on: blacklanternsecurity/.github#1
Cherry-pick: Replace CLA workflow with centralized reusable workflow
Reusable workflows inherit permissions from the caller, so the caller
must declare them. Without this the workflow fails with a silent
"workflow file issue" error.
Add permissions block to CLA caller workflow
Walk each path component between the trusted output_dir and the
target folder, refusing to proceed if any component is a symlink.
This prevents a local attacker from redirecting file writes by
pre-planting a symlink at the predictable owner/repo path.
- Python 3.9 -> 3.10 minimum, test matrix drops 3.9 adds 3.14
- starlette >=1.0.1 (+ fastapi >=0.133.0 to allow it)
- deepdiff, idna, pyjwt, lxml, orjson, ansible-core, tornado,
  cryptography, filelock, requests, Pygments, urllib3,
  pymdown-extensions, pytest, pytest-asyncio
Advisory fix 1
Advisory fix 1
Reject symlinks in github_workflows output path before mkdir
- unarchive: detect symlink/hardlink entries in archives
- github_workflows: check output_dir itself for symlinks
- github_workflows: sanitize artifact_name with Path.name
- Fix TestDockerPullRealmValidation: blasthttp_mock -> httpx_mock
@liquidsec liquidsec requested a review from ausmaster June 17, 2026 01:15
@liquidsec liquidsec mentioned this pull request Jun 17, 2026
@codecov

codecov Bot commented Jun 17, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90%. Comparing base (9cc4809) to head (283ab14).

Additional details and impacted files
@@          Coverage Diff          @@
##             dev   #3198   +/-   ##
=====================================
+ Coverage     90%     90%   +1%     
=====================================
  Files        453     453           
  Lines      46024   46024           
=====================================
+ Hits       41154   41155    +1     
+ Misses      4870    4869    -1     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@liquidsec liquidsec merged commit a74da8a into dev Jun 17, 2026
16 checks passed
@liquidsec liquidsec deleted the dev-stable-conflict-resolver branch June 17, 2026 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants