Skip to content

[8.19] fix(deps): bump click to 8.3.3 for CVE-2026-7246 (#4189) - #4236

Merged
Jan-Kazlouski-elastic merged 4 commits into
8.19from
backport/8.19/pr-4189
Jul 20, 2026
Merged

[8.19] fix(deps): bump click to 8.3.3 for CVE-2026-7246 (#4189)#4236
Jan-Kazlouski-elastic merged 4 commits into
8.19from
backport/8.19/pr-4189

Conversation

@Jan-Kazlouski-elastic

Copy link
Copy Markdown
Contributor

Backports the following commits to 8.19:

The 8.19 branch uses requirements/framework.txt (not the main layout), so the pin was applied there. The Click 8.2+ behavior changes from the original PR were ported to the 8.19 CLI: the connector/index/job groups now use invoke_without_command + manual help (bare invocation stays exit 0 instead of Click 8.2+ no_args_is_help exit 2), and the connector create tests were updated to feed explicit values for every prompt (Click 8.2+ no longer applies prompt defaults on EOF).

Validated locally on Python 3.11: tests/test_connectors_cli.py passes (44 passed) with click==8.3.3, and ruff check/ruff format --check are clean.

Made with Cursor

Co-authored-by: Cursor <cursoragent@cursor.com>
@Jan-Kazlouski-elastic
Jan-Kazlouski-elastic enabled auto-merge (squash) July 20, 2026 14:07
@Jan-Kazlouski-elastic
Jan-Kazlouski-elastic merged commit c752019 into 8.19 Jul 20, 2026
4 checks passed
@Jan-Kazlouski-elastic
Jan-Kazlouski-elastic deleted the backport/8.19/pr-4189 branch July 20, 2026 14:23
Jan-Kazlouski-elastic added a commit that referenced this pull request Jul 21, 2026
…VE-2026-34073, CVE-2026-26007) (#4238) (#4244)

Backports the following commits to 8.19:
- fix(deps): bump cffi to 2.0.0 to unblock cryptography 46.0.7
(CVE-2026-34073, CVE-2026-26007) (#4238)

The automated backport could not cherry-pick #4238 because 8.19 uses the
older layout: dependencies live in `requirements/framework.txt` (not
`app/connectors_service/pyproject.toml`). The equivalent pin
`cffi==1.16.0` -> `cffi==2.0.0` was applied there.

`cryptography` is transitive and was capped at **46.0.0** by the old
`cffi` pin (`cryptography` 46.0.5+ require `cffi>=2.0.0`). Bumping
`cffi` lets it resolve to **46.0.7**, clearing:
- **CVE-2026-26007** (fixed in 46.0.5)
- **CVE-2026-34073** (fixed in 46.0.6)
- **CVE-2026-39892** (fixed in 46.0.7)

`pyOpenSSL==26.0.0` (already on 8.19 via #4232) provides the
`cryptography` floor and keeps the ceiling at 46.x.

### Dependency resolution A/B (8.19, Python 3.11)

Installing `requirements/x86_64.txt`:

| `cffi` pin | resolved `cryptography` |
|------------|-------------------------|
| `1.16.0` (before) | `46.0.0` |
| `2.0.0` (after)   | `46.0.7` |

### NOTICE.txt (fully regenerated)

`NOTICE.txt` was regenerated from the real resolved dependency tree via
`make clean install autoformat lint test PYTHON=python3.11`
(pip-licenses). It now reflects `cffi 2.0.0` and `cryptography 46.0.7`,
and — because 8.19's `NOTICE.txt` had gone stale — it also captures
drift that recent security backports left unwritten (aiohttp `3.11.10`
-> `3.13.3` #4234, click `8.1.7` -> `8.3.3` #4236, pyOpenSSL `24.3.0` ->
`26.0.0` #4232, pyasn1 `0.6.0` -> `0.6.4` #4233, elastic-agent-client
`0.0.1.dev1` -> `0.0.2` / protobuf `5.27.5` -> `5.29.6` #4235, plus
transitive updates). This brings `NOTICE.txt` into its cleanest,
freshest state.

### Local validation (Python 3.11)

`make clean install autoformat lint test PYTHON=python3.11`:
- **2437 tests passed**, ruff `check`/`format --check` clean, coverage
**92.39%** (>= 92% gate).
- The single `--fail-slow` flag on
`tests/sources/test_s3.py::test_close_with_client_session` is a
timing-threshold artifact (`1.28s > 1.0s`, "Test passed but took too
long"), not a functional failure.

Made with [Cursor](https://cursor.com)

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants