Skip to content

security: replace advocate with champion and upgrade urllib3 to 2.x - #7746

Draft
wtfiwtz wants to merge 1 commit into
getredash:masterfrom
orchestrated-io:security/champion-ssrf
Draft

wtfiwtz wants to merge 1 commit into
getredash:masterfrom
orchestrated-io:security/champion-ssrf

Conversation

@wtfiwtz

@wtfiwtz wtfiwtz commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Summary

Replace deprecated advocate with champion and upgrade urllib3 to 2.x in one PR, so ENFORCE_PRIVATE_ADDRESS_BLOCK is never left without an SSRF implementation.

Rebased onto current master after #7755 (Poetry → uv) and #7768 (Authlib stack). Supersedes #7745 (closed).

Dependency changes

  • Remove advocate==1.0.0
  • urllib3: 1.26.19 → 2.7.0
  • boto3 / botocore: 1.28.8 / 1.31.8 → 1.43.7
  • Add optional uv dependency group ssrf with champion pinned to git rev 74cf301

Code / settings

  • requests_or_advocaterequests_or_champion
  • ENFORCE_PRIVATE_ADDRESS_BLOCK default: truefalse (opt-in; requires champion install)

Enable SSRF protection

  1. Set REDASH_ENFORCE_PRIVATE_IP_BLOCK=true
  2. Install champion: uv sync --group ssrf (or add ssrf to Dockerfile install_groups)

What type of PR is this?

  • Other (security dependency upgrade)

How is this tested?

  • Unit tests (pytest, jest)
  • E2E Tests (Cypress)
  • Manually
  • N/A

Related

Upgrade urllib3 to 2.7.0 with matching AWS SDK bumps, and restore SSRF
protection via champion in one PR so ENFORCE_PRIVATE_ADDRESS_BLOCK is
never left dead (supersedes getredash#7745).

- Remove unmaintained advocate (blocks urllib3 2.x)
- urllib3 1.26.19 → 2.7.0; boto3/botocore → 1.43.7
- Add optional uv dependency group `ssrf` pinned to champion git rev
- Default ENFORCE_PRIVATE_ADDRESS_BLOCK to false (opt-in + champion)
- Wire requests_or_champion through HTTP/CSV/Excel query runners

Co-authored-by: Cursor <cursoragent@cursor.com>
@wtfiwtz
wtfiwtz force-pushed the security/champion-ssrf branch from 071092c to bf23454 Compare August 4, 2026 03:38
@wtfiwtz

wtfiwtz commented Aug 4, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto current master (uv + #7768). Converted the Poetry ssrf group to a uv dependency-groups.ssrf pin and regenerated uv.lock. #7745 is closed so this is the single urllib3 2.x + champion landing path.

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.

1 participant