Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[smart_holder] git merge master #4885

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Oct 17, 2023

Description

Helper/scratch PR for testing.

Suggested changelog entry:

pablospe and others added 3 commits October 16, 2023 07:42
…pybind#4880)

* Update pytest (which removes their dependency on py)

The py library through 1.11.0 for Python allows remote attackers to conduct a ReDoS (Regular expression Denial of Service) attack via a Subversion repository with crafted info data, because the InfoSvnCommand argument is mishandled.

The particular codepath in question is the regular expression at py._path.svnurl.InfoSvnCommand.lspattern and is only relevant when dealing with subversion (svn) projects. Notably the codepath is not used in the popular pytest project. The developers of the pytest package have released version 7.2.0 which removes their dependency on py. Users of pytest seeing alerts relating to this advisory may update to version 7.2.0 of pytest to resolve this issue. See pytest-dev/py#287 (comment) for additional context.

* Added conditions so that we keep using 7.0.0 on python 3.6
@rwgk
Copy link
Collaborator Author

rwgk commented Oct 17, 2023

The two

🐍 3.9-dbg (deadsnakes) • Valgrind • x64

failures are unrelated. First observed on master 2023-10-16 (yesterday).

@rwgk rwgk merged commit ae02940 into pybind:smart_holder Oct 17, 2023
152 of 154 checks passed
@rwgk rwgk deleted the sh_merge_master branch October 17, 2023 20:18
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Oct 17, 2023
@rwgk rwgk removed the needs changelog Possibly needs a changelog entry label Oct 17, 2023
rwgk pushed a commit to google/pybind11clif that referenced this pull request Oct 17, 2023
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