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

git merge smart_holder #30070

Merged
merged 4 commits into from
Oct 17, 2023
Merged

git merge smart_holder #30070

merged 4 commits into from
Oct 17, 2023

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Oct 17, 2023

Description

Helper/scratch PR for testing.

This PR is importing pybind/pybind11#4885.

Suggested changelog entry:

pablospe and others added 4 commits October 16, 2023 07:42
…google#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
@google-cla
Copy link

google-cla bot commented Oct 17, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@rwgk
Copy link
Contributor Author

rwgk commented Oct 17, 2023

The two

🐍 3.9-dbg (deadsnakes) • Valgrind • x64

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

@rwgk rwgk marked this pull request as ready for review October 17, 2023 20:21
@rwgk rwgk merged commit 40bbff3 into google:main Oct 17, 2023
147 of 149 checks passed
@rwgk rwgk deleted the pywrapcc_merge_sh branch October 17, 2023 20:22
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