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.

Sign up for GitHub

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

Jump to bottom

gh-95778: add doc missing in some places #100627

Merged

miss-islington merged 2 commits into python:main from merwok:complete-doc-int-max-str-digits

Dec 30, 2022

Member

merwok commented Dec 30, 2022 •

edited by miss-islington

Issue: CVE-2020-10735: Prevent DoS by large int<->str conversions #95778

Automerge-Triggered-By: GH:merwok


          add doc missing in some places for pythongh-95778

3497f9c

merwok added needs backport to 3.7 needs backport to 3.8 needs backport to 3.9 needs backport to 3.10 needs backport to 3.11 labels

merwok requested a review from gpshead

December 30, 2022 20:33

bedevere-bot mentioned this pull request

CVE-2020-10735: Prevent DoS by large int<->str conversions #95778

Closed

bedevere-bot added the awaiting core review label

merwok linked an issue

that may be closed by this pull request

CVE-2020-10735: Prevent DoS by large int<->str conversions #95778

Closed


          Merge branch 'main' into complete-doc-int-max-str-digits

d684569

merwok added the skip news label

gpshead approved these changes

View reviewed changes

Member

gpshead left a comment

We truly have things documented in too many places...

bedevere-bot added awaiting merge and removed awaiting core review labels

Member Author

merwok commented Dec 30, 2022

I intend to make another issue to discuss adding notes somewhere (devguide and initconfig.c file?), sorting options in the same order everywhere, formatting in a way that makes it easy to copy-paste between the locations, and reformatting to make help output a bit shorter.

Or… maybe it’s time to create one source file that gets mogrified into reST, C and roff formats and automatically included.

merwok added the 🤖 automerge label

miss-islington merged commit 4652182 into python:main

bedevere-bot removed the awaiting merge label

Contributor

miss-islington commented Dec 30, 2022

Thanks @merwok for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8, 3.9, 3.10, 3.11.
🐍🍒⛏🤖

merwok deleted the complete-doc-int-max-str-digits branch

December 30, 2022 21:21

This comment was marked as resolved.

Sign in to view

bedevere-bot commented Dec 30, 2022

GH-100628 is a backport of this pull request to the 3.11 branch.

miss-islington self-assigned this

bedevere-bot removed the needs backport to 3.11 label

This comment was marked as resolved.

Sign in to view

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-95778: add doc missing in some places (pythonGH-100627)

c36afcf

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

miss-islington added a commit that referenced this pull request


          gh-95778: add doc missing in some places (GH-100627)

b1e314a

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

merwok added a commit to merwok/cpython that referenced this pull request


          [3.10] pythongh-95778: add doc missing in some places (pythonGH-100627).

a099337

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

bedevere-bot commented Jan 16, 2023

GH-101065 is a backport of this pull request to the 3.10 branch.

bedevere-bot removed the needs backport to 3.10 label

merwok added a commit to merwok/cpython that referenced this pull request


          [3.9] pythongh-95778: add doc missing in some places (pythonGH-100627).

c67e081

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

bedevere-bot commented Jan 16, 2023

GH-101066 is a backport of this pull request to the 3.9 branch.

bedevere-bot removed the needs backport to 3.9 label

ambv pushed a commit that referenced this pull request


          [3.9] gh-95778: add doc missing in some places (GH-100627). (#101066)

6be2e0e

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

ambv pushed a commit that referenced this pull request


          [3.10] gh-95778: add doc missing in some places (GH-100627). (#101065)

c77b0ce

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

Member Author

merwok commented Jan 21, 2023

Thank you @ambv for merging backport PRs – I’ll create the last two tomorrow.

merwok added a commit to merwok/cpython that referenced this pull request


          [3.8] pythongh-95778: add doc missing in some places (pythonGH-100627).

14e5240

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

bedevere-bot commented Feb 7, 2023

GH-101630 is a backport of this pull request to the 3.8 branch.

bedevere-bot removed the needs backport to 3.8 label

merwok added a commit to merwok/cpython that referenced this pull request


          [3.7] pythongh-95778: add doc missing in some places (pythonGH-100627).

dd1cd7b

(cherry picked from commit 4652182)

Co-authored-by: Éric <earaujo@caravan.coop>

bedevere-bot commented Feb 7, 2023

GH-101631 is a backport of this pull request to the 3.7 branch.

bedevere-bot removed the needs backport to 3.7 label

ned-deily pushed a commit that referenced this pull request


          [3.7] gh-95778: add doc missing in some places (GH-100627) (GH-101631)

ecfed4f

(cherry picked from commit 4652182)

ambv pushed a commit that referenced this pull request


          [3.8] gh-95778: add doc missing in some places (GH-100627) (#101630)

41d301a

(cherry picked from commit 4652182)

merwok mentioned this pull request

Doc for -X dev option should mention PYTHONDEVMODE #83893

Closed

carlosroman added a commit to DataDog/cpython that referenced this pull request

* Post 3.8.16

* [3.8] Update copyright years to 2023. (pythongh-100852)

* [3.8] Update copyright years to 2023. (pythongh-100848).
(cherry picked from commit 11f9932)

Co-authored-by: Benjamin Peterson <benjamin@python.org>

* Update additional copyright years to 2023.

Co-authored-by: Ned Deily <nad@python.org>

* [3.8] Update copyright year in README (pythonGH-100863) (pythonGH-100867)

(cherry picked from commit 30a6cc4)

Co-authored-by: Ned Deily <nad@python.org>
Co-authored-by: HARSHA VARDHAN <75431678+Thunder-007@users.noreply.github.com>

* [3.8] Correct CVE-2020-10735 documentation (pythonGH-100306) (python#100698)

(cherry picked from commit 1cf3d78)
(cherry picked from commit 88fe8d7)

Co-authored-by: Jeremy Paige <ucodery@gmail.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>

* [3.8] Bump Azure Pipelines to ubuntu-22.04 (pythonGH-101089) (python#101215)

(cherry picked from commit c22a55c)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

* [3.8] pythongh-100180: Update Windows installer to OpenSSL 1.1.1s (pythonGH-100903) (python#101258)

* pythongh-101422: (docs) TarFile default errorlevel argument is 1, not 0 (pythonGH-101424)

(cherry picked from commit ea23271)

Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>

* [3.8] pythongh-95778: add doc missing in some places (pythonGH-100627) (python#101630)

(cherry picked from commit 4652182)

* [3.8] pythongh-101283: Improved fallback logic for subprocess with shell=True on Windows (pythonGH-101286) (python#101710)

Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>
Co-authored-by: Steve Dower <steve.dower@microsoft.com>

* [3.8] pythongh-101981: Fix Ubuntu SSL tests with OpenSSL (3.1.0-beta1) CI i… (python#102095)

[3.8] pythongh-101981: Fix Ubuntu SSL tests with OpenSSL (3.1.0-beta1) CI issue (pythongh-102079)

* [3.8] pythonGH-102306 Avoid GHA CI macOS test_posix failure by using the appropriate macOS SDK (pythonGH-102307)

[3.8] Avoid GHA CI macOS test_posix failure by using the appropriate macOS SDK.

* [3.8] pythongh-101726: Update the OpenSSL version to 1.1.1t (pythonGH-101727) (pythonGH-101752)

Fixes CVE-2023-0286 (High) and a couple of Medium security issues.
https://www.openssl.org/news/secadv/20230207.txt

Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Ned Deily <nad@python.org>

* [3.8] pythongh-102627: Replace address pointing toward malicious web page (pythonGH-102630) (pythonGH-102667)

(cherry picked from commit 61479d4)

Co-authored-by: Blind4Basics <32236948+Blind4Basics@users.noreply.github.com>
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

* [3.8] pythongh-101997: Update bundled pip version to 23.0.1 (pythonGH-101998). (python#102244)

(cherry picked from commit 89d9ff0)

* [3.8] pythongh-102950: Implement PEP 706 – Filter for tarfile.extractall (pythonGH-102953) (python#104548)

Backport of c8c3956

* [3.8] pythongh-99889: Fix directory traversal security flaw in uu.decode() (pythonGH-104096) (python#104332)

(cherry picked from commit 0aeda29)

Co-authored-by: Sam Carroll <70000253+samcarroll42@users.noreply.github.com>

* [3.8] pythongh-104049: do not expose on-disk location from SimpleHTTPRequestHandler (pythonGH-104067) (python#104121)

Do not expose the local server's on-disk location from `SimpleHTTPRequestHandler` when generating a directory index. (unnecessary information disclosure)

(cherry picked from commit c7c3a60)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

* [3.8] pythongh-103935: Use `io.open_code()` when executing code in trace and profile modules (pythonGH-103947) (python#103954)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>

* [3.8] pythongh-68966: fix versionchanged in docs (pythonGH-105299)

* [3.8] Update GitHub CI workflow for macOS. (pythonGH-105302)

* [3.8] pythongh-105184: document that marshal functions can fail and need to be checked with PyErr_Occurred (pythonGH-105185) (python#105222)

(cherry picked from commit ee26ca1)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>

* [3.8] pythongh-102153: Start stripping C0 control and space chars in `urlsplit` (pythonGH-102508) (pythonGH-104575) (pythonGH-104592) (python#104593) (python#104895)

`urllib.parse.urlsplit` has already been respecting the WHATWG spec a bit pythonGH-25595.

This adds more sanitizing to respect the "Remove any leading C0 control or space from input" [rule](https://url.spec.whatwg.org/GH-url-parsing:~:text=Remove%20any%20leading%20and%20trailing%20C0%20control%20or%20space%20from%20input.) in response to [CVE-2023-24329](https://nvd.nist.gov/vuln/detail/CVE-2023-24329).

I simplified the docs by eliding the state of the world explanatory
paragraph in this security release only backport.  (people will see
that in the mainline /3/ docs)

(cherry picked from commit d7f8a5f)
(cherry picked from commit 2f630e1)
(cherry picked from commit 610cc0a)
(cherry picked from commit f48a96a)

Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: Illia Volochii <illia.volochii@gmail.com>
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>

* [3.8] pythongh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (pythonGH-105174) (pythonGH-105200) (pythonGH-105205) (python#105370)

Upgrade builds to OpenSSL 1.1.1u.

Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9.

Manual edits to the _ssl_data_300.h file prevent it from removing any
existing definitions in case those exist in some peoples builds and were
important (avoiding regressions during backporting).

(cherry picked from commit ede89af)
(cherry picked from commit e15de14)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Ned Deily <nad@python.org>

* Python 3.8.17

* Post 3.8.17

* Updated CI to build 3.8.17

---------

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Benjamin Peterson <benjamin@python.org>
Co-authored-by: Ned Deily <nad@python.org>
Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Co-authored-by: HARSHA VARDHAN <75431678+Thunder-007@users.noreply.github.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Jeremy Paige <ucodery@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: Steve Dower <steve.dower@python.org>
Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>
Co-authored-by: Éric <earaujo@caravan.coop>
Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
Co-authored-by: Dong-hee Na <donghee.na@python.org>
Co-authored-by: Blind4Basics <32236948+Blind4Basics@users.noreply.github.com>
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: Sam Carroll <70000253+samcarroll42@users.noreply.github.com>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Co-authored-by: stratakis <cstratak@redhat.com>
Co-authored-by: Illia Volochii <illia.volochii@gmail.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment