Skip to content

fix: constrain starlette to >=1.0.1 (CVE-2026-48710) (backport #5977) - #5979

Merged
cdoern merged 1 commit into
release-0.7.xfrom
mergify/bp/release-0.7.x/pr-5977
May 28, 2026
Merged

fix: constrain starlette to >=1.0.1 (CVE-2026-48710) (backport #5977)#5979
cdoern merged 1 commit into
release-0.7.xfrom
mergify/bp/release-0.7.x/pr-5977

Conversation

@mergify

@mergify mergify Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor

GHSA-86qp-5c8j-p5mr


Open in Devin Review
This is an automatic backport of pull request #5977 done by [Mergify](https://mergify.com).
Open in Devin Review

@mergify

mergify Bot commented May 28, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 41c94c4 has failed:

On branch mergify/bp/release-0.7.x/pr-5977
Your branch is up to date with 'origin/release-0.7.x'.

You are currently cherry-picking commit 41c94c49.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pyproject.toml
	both modified:   uv.lock

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 1 potential issue.

View 2 additional findings in Devin Review.

Open in Devin Review

Comment thread pyproject.toml Outdated
Comment on lines +11 to +35
<<<<<<< HEAD
"pyasn1>=0.6.3", # CVE-2026-30922: DoS via unbounded recursion
=======
"aiohttp>=3.13.4", # CVE-2026-34514 + 9 more: CRLF injection, header leak, DoS
"authlib>=1.6.11", # CVE-2026-41425 + 7 more: account takeover, JWE padding oracle, sig bypass
"cryptography>=46.0.7", # CVE-2026-39892: buffer overflow; CVE-2026-34073: DNS constraint bypass
"fonttools>=4.60.2",
"gitpython>=3.1.47", # Command injection via Git options bypass
"h11>=0.16.0",
"idna>=3.15",
"pydantic>=2.11.9,<2.12.0", # 2.12 breaks int coercion in openai.types.model.Model during test replay
"lxml>=6.1.0", # CVE-2026-41066: XML entity expansion with default resolve_entities=True
"pillow>=12.2.0", # CVE-2026-40192 + 4 more: heap overflow, OOB write, DoS
"protobuf>=5.29.6", # CVE-2025-4565 + CVE-2026-0994: parsing vulnerabilities
"pyasn1>=0.6.3", # CVE-2026-30922: DoS via unbounded recursion
"python-multipart>=0.0.27", # CVE-2026-40347: header injection; CVE-2026-42561: DoS via oversized headers
"python-socketio>=5.14.0", # CVE-2025-61765: RCE via pickle deserialization
"requests>=2.34.2",
"setuptools<81", # milvus-lite imports pkg_resources; setuptools 81+ removes it
"starlette>=1.0.1", # CVE-2026-48710
"tornado>=6.5.5",
"urllib3>=2.7.0",
"transformers>=4.57.2,<5.0.0", # CVE-2026-1839 fix only in 5.x; ogx doesn't use Trainer; 5.x breaks HybridCache imports
"werkzeug>=3.1.6", # CVE-2025-66221 + 2 more: safe_join() device name bypass
>>>>>>> 41c94c49 (fix: constrain starlette to >=1.0.1 (CVE-2026-48710) (#5977))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔴 Unresolved git merge conflict markers in pyproject.toml break TOML parsing

The file contains literal <<<<<<< HEAD, =======, and >>>>>>> 41c94c49 (...) conflict markers at lines 11, 13, and 35. These are not valid TOML syntax, so any tool that parses pyproject.toml — including uv, pip, setuptools, ruff, mypy, and pytest — will fail with a parse error. The project cannot be installed, built, linted, or tested in this state.

Suggested change
<<<<<<< HEAD
"pyasn1>=0.6.3", # CVE-2026-30922: DoS via unbounded recursion
=======
"aiohttp>=3.13.4", # CVE-2026-34514 + 9 more: CRLF injection, header leak, DoS
"authlib>=1.6.11", # CVE-2026-41425 + 7 more: account takeover, JWE padding oracle, sig bypass
"cryptography>=46.0.7", # CVE-2026-39892: buffer overflow; CVE-2026-34073: DNS constraint bypass
"fonttools>=4.60.2",
"gitpython>=3.1.47", # Command injection via Git options bypass
"h11>=0.16.0",
"idna>=3.15",
"pydantic>=2.11.9,<2.12.0", # 2.12 breaks int coercion in openai.types.model.Model during test replay
"lxml>=6.1.0", # CVE-2026-41066: XML entity expansion with default resolve_entities=True
"pillow>=12.2.0", # CVE-2026-40192 + 4 more: heap overflow, OOB write, DoS
"protobuf>=5.29.6", # CVE-2025-4565 + CVE-2026-0994: parsing vulnerabilities
"pyasn1>=0.6.3", # CVE-2026-30922: DoS via unbounded recursion
"python-multipart>=0.0.27", # CVE-2026-40347: header injection; CVE-2026-42561: DoS via oversized headers
"python-socketio>=5.14.0", # CVE-2025-61765: RCE via pickle deserialization
"requests>=2.34.2",
"setuptools<81", # milvus-lite imports pkg_resources; setuptools 81+ removes it
"starlette>=1.0.1", # CVE-2026-48710
"tornado>=6.5.5",
"urllib3>=2.7.0",
"transformers>=4.57.2,<5.0.0", # CVE-2026-1839 fix only in 5.x; ogx doesn't use Trainer; 5.x breaks HybridCache imports
"werkzeug>=3.1.6", # CVE-2025-66221 + 2 more: safe_join() device name bypass
>>>>>>> 41c94c49 (fix: constrain starlette to >=1.0.1 (CVE-2026-48710) (#5977))
"aiohttp>=3.13.4", # CVE-2026-34514 + 9 more: CRLF injection, header leak, DoS
"authlib>=1.6.11", # CVE-2026-41425 + 7 more: account takeover, JWE padding oracle, sig bypass
"cryptography>=46.0.7", # CVE-2026-39892: buffer overflow; CVE-2026-34073: DNS constraint bypass
"fonttools>=4.60.2",
"gitpython>=3.1.47", # Command injection via Git options bypass
"h11>=0.16.0",
"idna>=3.15",
"pydantic>=2.11.9,<2.12.0", # 2.12 breaks int coercion in openai.types.model.Model during test replay
"lxml>=6.1.0", # CVE-2026-41066: XML entity expansion with default resolve_entities=True
"pillow>=12.2.0", # CVE-2026-40192 + 4 more: heap overflow, OOB write, DoS
"protobuf>=5.29.6", # CVE-2025-4565 + CVE-2026-0994: parsing vulnerabilities
"pyasn1>=0.6.3", # CVE-2026-30922: DoS via unbounded recursion
"python-multipart>=0.0.27", # CVE-2026-40347: header injection; CVE-2026-42561: DoS via oversized headers
"python-socketio>=5.14.0", # CVE-2025-61765: RCE via pickle deserialization
"requests>=2.34.2",
"setuptools<81", # milvus-lite imports pkg_resources; setuptools 81+ removes it
"starlette>=1.0.1", # CVE-2026-48710
"tornado>=6.5.5",
"urllib3>=2.7.0",
"transformers>=4.57.2,<5.0.0", # CVE-2026-1839 fix only in 5.x; ogx doesn't use Trainer; 5.x breaks HybridCache imports
"werkzeug>=3.1.6", # CVE-2025-66221 + 2 more: safe_join() device name bypass
Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

@cdoern
cdoern force-pushed the mergify/bp/release-0.7.x/pr-5977 branch from fd90f8e to b748455 Compare May 28, 2026 14:07
GHSA-86qp-5c8j-p5mr
<!-- devin-review-badge-begin -->

---

<a href="https://app.devin.ai/review/ogx-ai/ogx/pull/5977"
target="_blank">
  <picture>
<source media="(prefers-color-scheme: dark)"
srcset="https://static.devin.ai/assets/gh-open-in-devin-review-dark.svg?v=1">
<img
src="https://static.devin.ai/assets/gh-open-in-devin-review-light.svg?v=1"
alt="Open in Devin Review">
  </picture>
</a>
<!-- devin-review-badge-end -->

---------

Signed-off-by: Eoin Fennessy <efenness@redhat.com>
Co-authored-by: Matthew Farrellee <matt@cs.wisc.edu>
(cherry picked from commit 41c94c4)
Signed-off-by: Charlie Doern <cdoern@redhat.com>
@cdoern
cdoern force-pushed the mergify/bp/release-0.7.x/pr-5977 branch from b748455 to ff20ae6 Compare May 28, 2026 14:10
@cdoern
cdoern merged commit 840045d into release-0.7.x May 28, 2026
71 of 86 checks passed
@cdoern
cdoern deleted the mergify/bp/release-0.7.x/pr-5977 branch May 28, 2026 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants