1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Commit Graph

14213 Commits

Author SHA1 Message Date
Jake Howard
4de4edf2c0 [5.2.x] Fixed #36447 -- Selected preferred media type based on quality.
When matching which entry in the `Accept` header should be used for
a given media type, the specificity matters. However once those are
resolved, only the quality matters when selecting preference.

Regression in c075508b4d.

Thank you to Anders Kaseorg for the report.

Backport of 12c1557060 from main.
2025-06-16 09:27:46 +02:00
Sarah Boyce
f5cc6a888b [5.2.x] Corrected jsonfield fieldlookup references.
Backport of 8e2249bc79 from main.
2025-06-13 09:53:30 +02:00
Sulove Bista
538616136b [5.2.x] Fixed #36463 -- Fixed grammar in docs/intro/contributing.txt.
Backport of e80b33ae4d from main.
2025-06-12 15:14:52 -03:00
ruvilonix
e3b2370795 [5.2.x] Fixed #36454 -- Fixed typo in docs/intro/tutorial08.txt.
Backport of 87a5ae6c5b from main.
2025-06-12 09:56:39 +02:00
junghwan16
91569cffec [5.2.x] Fixed #36425 -- Standardized integer fields descriptions.
Backport of 091f66e51a from main.
2025-06-11 10:00:21 +02:00
Sarah Boyce
329a5c9228 [5.2.x] Added follow-up to CVE-2025-48432 to security archive.
Backport of 2714bc3f2c from main.
2025-06-10 15:11:54 +02:00
Sarah Boyce
69fe089f00 [5.2.x] Added stub release notes for 5.2.4.
Backport of 7fcc7b1a0c from main.
2025-06-10 12:31:19 +02:00
Jacob Walls
264003146f [5.2.x] Refs #373 -- Doc'd that on_delete is ignored for ForeignObject.
Backport of 76e1ca77bc from main.
2025-06-10 09:48:25 +02:00
Jacob Walls
6f99c8856d [5.2.x] Fixed #36449 -- Fixed field types in example model using ForeignObject.
Backport of 5942754769 from main.
2025-06-10 09:47:37 +02:00
Natalia
cc5079730a [5.2.x] Fixed #36446 -- Restored "q" in internal MediaType.params property.
The "q" key was removed while addressing ticket #36411. Despite
`MediaType.params` is undocumented and considered internal, it was used
in third-party projects (Zulip reported breakage), so this work restored
the `q` key in `params`.

Thanks Anders Kaseorg for the report.

Regression in c075508b4d.

Backport of cf5f36bf90 from main.
2025-06-09 17:39:25 -03:00
Clifford Gama
6fc620b4a8 [5.2.x] Fixed #36419 -- Ensured for_save was propagated when resolving expressions.
The for_save flag wasn't properly propagated when resolving expressions, which
prevented get_db_prep_save() from being called in some cases. This affected
fields like JSONField where None would be saved as JSON null instead of SQL NULL.

Regression in 00c690efbc.

Thanks to David Sanders and Simon Charette for reviews.

Co-authored-by: Adam Johnson <me@adamj.eu>

Backport of c1fa3fdd04 from main.
2025-06-06 17:41:51 +02:00
Jake Howard
8fcc83953c [5.2.x] Refs CVE-2025-48432 -- Prevented log injection in remaining response logging.
Migrated remaining response-related logging to use the `log_response()`
helper to avoid potential log injection, to ensure untrusted values like
request paths are safely escaped.

Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>

Backport of 9579517552 from main.
2025-06-06 09:07:12 -03:00
Sarah Boyce
5901cfe591 [5.2.x] Updated translations from Transifex. 2025-06-06 13:55:05 +02:00
Natalia
48a82d44d8 [5.2.x] Added CVE-2025-48432 to security archive.
Backport of 51923c576a from main.
2025-06-04 10:58:40 -03:00
Natalia
3bc3ce8e64 [5.2.x] Added stub release notes for 5.2.3.
Backport of 1f19c36e2d from main.
2025-06-04 10:56:00 -03:00
Natalia
7456aa23da [5.2.x] Fixed CVE-2025-48432 -- Escaped formatting arguments in log_response().
Suitably crafted requests containing a CRLF sequence in the request
path may have allowed log injection, potentially corrupting log files,
obscuring other attacks, misleading log post-processing tools, or
forging log entries.

To mitigate this, all positional formatting arguments passed to the
logger are now escaped using "unicode_escape" encoding.

Thanks to Seokchan Yoon (https://ch4n3.kr/) for the report.

Co-authored-by: Carlton Gibson <carlton@noumenal.es>
Co-authored-by: Jake Howard <git@theorangeone.net>

Backport of a07ebec559 from main.
2025-06-04 08:34:51 -03:00
Simon Charette
3340d41446 [5.2.x] Fixed #36432 -- Fixed a prefetch_related crash on related target subclass queryset.
Regression in 626d77e52a.

Refs #36116.

Thanks Cornelis Poppema for the excellent report.

Backport of 08187c94ed from main.
2025-06-04 10:48:13 +02:00
Jake Howard
0c548e62d0 [5.2.x] Fixed #36411 -- Made HttpRequest.get_preferred_type() consider media type parameters.
HttpRequest.get_preferred_type() did not account for parameters in
Accept header media types (e.g., "text/vcard; version=3.0"). This caused
incorrect content negotiation when multiple types differed only by
parameters, reducing specificity as per RFC 7231 section 5.3.2
(https://datatracker.ietf.org/doc/html/rfc7231.html#section-5.3.2).

This fix updates get_preferred_type() to treat media types with
parameters as distinct, allowing more precise and standards-compliant
matching.

Thanks to magicfelix for the report, and to David Sanders and Sarah
Boyce for the reviews.

Backport of c075508b4d from main.
2025-06-03 16:11:38 -03:00
Jacob Walls
2bf4c5b9ea [5.2.x] Fixed #36416 -- Made QuerySet.in_bulk() account for composite pks in id_list.
Backport of 26313bc219 from main.
2025-06-03 17:46:59 +02:00
Blayze
37e5cc6d89 [5.2.x] Fixed #36423 -- Prevented filter_horizontal buttons from intercepting form submission.
In the admin's filter_horizontal widget, optional action buttons like
"Choose all", "Remove all", etc. were changed from `<a>` to `<button>`
elements in #34619, but without specifying `type="button"`. As a result,
when pressing Enter while focused on a form input, these buttons could
be triggered and intercept form submission.

Explicitly set `type="button"` on these control buttons to prevent them
from acting as submit buttons.

Thanks Antoliny Lee for the quick triage and review.

Regression in 857b1048d5.

Backport of 90429625a8 from main.
2025-06-02 22:26:36 -03:00
Natalia
e107b8a9d3 [5.2.x] Added stub release notes and release date for 5.2.2, 5.1.10, and 4.2.22.
Backport of 1a74434399 from main.
2025-05-28 10:18:13 -03:00
Jason Judkins
81320d0a61 [5.2.x] Fixed #36402, Refs #35980 -- Updated built package name in reusable apps tutorial for PEP 625.
Backport of 1307b8a1cb from main.
2025-05-26 12:34:31 -03:00
Adam Johnson
7e4b371eb0 [5.2.x] Fixed #36405 -- Fixed OrderableAggMixin.order_by using OuterRef.
co-authored-by: Simon Charette <charette.s@gmail.com>

Backport of c2615a0500 from main.
2025-05-23 16:23:34 +02:00
Adam Johnson
c29e3092fd [5.2.x] Fixed #36404 -- Fixed Aggregate.filter using OuterRef.
Regression in a76035e925.
Thank you to Simon Charette for the review.

co-authored-by: Simon Charette <charette.s@gmail.com>

Backport of b8e5a8a9a2 from main.
2025-05-23 15:19:50 +02:00
Adam Zapletal
bd873e84be [5.2.x] Fixed typo in docs/ref/forms/renderers.txt.
Backport of d2732c30af from main.
2025-05-23 11:21:14 +02:00
Sarah Boyce
9db932ab4c [5.2.x] Fixed #36390 -- Deprecated RemoteUserMiddleware subclasses missing aprocess_request().
Regression in 50f89ae850.
Thank you to shamoon for the report and Natalia Bidart for the review.

Backport of 1704c49a9b from main.
2025-05-23 10:24:09 +02:00
Colleen Dunlap
787f3130f7 [5.2.x] Fixed #36388 -- Made QuerySet.union() return self when called with no arguments.
Regression in 9cb8baa0c4.
Thank you to Antoine Humeau for the report and Simon Charette for the review.

Backport of 802baf5da5 from main.
2025-05-19 10:36:08 +02:00
Jacob Walls
6228a35095 [5.2.x] Fixed #36392 -- Raised ValueError when subquery referencing composite pk selects too many columns.
Backport of 994dc6d8a1 from main.
2025-05-16 08:21:18 +02:00
antoliny0919
954e24758c [5.2.x] Added missing import in docs/ref/contrib/admin/index.txt.
Backport of a79c411147 from main.
2025-05-15 15:49:19 +02:00
Jacob Walls
9cbd7dd349 [5.2.x] Fixed incorrect spacing in docs/ref/contrib/postgres/fields.txt.
Backport of e52100a250 from main.
2025-05-15 09:22:52 -03:00
Lily Foote
817ed81aea [5.2.x] Updated guidance to propose new feature ideas in contributing docs.
These changes include:
* Clarification of the new feature proposal and evaluation process.
* Reodering "points to consider" into reporting bugs section, since
  these are mostly trac-specific.
* Narrowing the guide on user interface bugs and features to just bugs.
* Updating documentation for Someday/Maybe triage stage.

Co-authored-by: Tim Schilling <schilling711@gmail.com>
Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>

Backport of 188799e67c from main.
2025-05-13 21:40:21 -03:00
Simon Charette
e23dd72880 [5.2.x] Fixed #36373 -- Fixed select_related() crash on foreign object for a composite pk.
Thanks Jacob Walls for the report and Sarah for the in-depth review.

Backport of 8be0c0d690 from main.
2025-05-12 13:34:45 +02:00
Natalia
ab5c066472 [5.2.x] Refs #35980 -- Added release note about changes in release artifacts filenames.
Backport of 42ab99309d from main.
2025-05-09 13:30:14 -03:00
Natalia
8352140edd [5.2.x] Removed "Expected" from release date for 5.2.1, 5.1.9, and 4.2.21.
Backport of c86156378d from main.
2025-05-09 13:30:04 -03:00
Natalia
ac69fd1c6d [5.2.x] Cleaned up CVE-2025-32873 security archive description.
Backport of 37f2a77c72 from main.
2025-05-07 11:37:09 -03:00
Natalia
98cb9d0608 [5.2.x] Added CVE-2025-32873 to security archive.
Backport of fdabda4e05 from main.
2025-05-07 11:08:47 -03:00
Natalia
cb97aec397 [5.2.x] Added stub release notes for 5.2.2.
Backport of d8397bf6cd from main.
2025-05-07 10:56:41 -03:00
Sarah Boyce
c9731dc656 [5.2.x] Fixed CVE-2025-32873 -- Mitigated potential DoS in strip_tags().
Thanks to Elias Myllymäki for the report, and Shai Berger and Jake
Howard for the reviews.

Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>

Backport of 9f3419b519 from main.
2025-05-06 22:24:24 -03:00
Natalia
ae6b5df711 [5.2.x] Simplified artifact building steps in docs/internals/howto-release-django.txt.
With the recent merge of artifact build updates from
https://github.com/django/django/pull/19436, there is no need to have
different build instructions for 4.2.

Backport of f7d97dd118 from main.
2025-05-06 11:13:07 -03:00
Clifford Gama
3c887e5e50 [5.2.x] Fixed #17461 -- Doc'd the presumed order of foreign keys on the intermediary model of a self-referential m2m.
Thanks Giannis Terzopoulos and Sarah Boyce for the reviews.

Backport of 9d93e35c20 from main.
2025-05-02 09:02:16 +02:00
Natalia
57c245199a [5.2.x] Made cosmetic edits and added upcoming security release to release notes.
Backport of 0f5dd0dff3 from main.
2025-04-30 14:56:07 -03:00
Baptiste Mispelon
1367a197dd [5.2.x] Fixed #36357 -- Skipped unique_together in inspectdb output for composite primary keys.
Thanks to Baptiste Mispelon for the report and quick fix, and to Simon
Charette and Jacob Walls for the reviews.

Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>

Backport of 66f9eb0ff1 from main.
2025-04-30 11:55:56 -03:00
Simon Charette
ec73fd6746 [5.2.x] Fixed #36358 -- Corrected introspection of composite primary keys on SQLite.
Previously, any first field of a composite primary key with type
`INTEGER` was incorrectly introspected as an `AutoField` due to SQLite
treating `INTEGER PRIMARY KEY` as an alias for the `ROWID`.

This change ensures that integer fields in composite PKs are not
mistaken for auto-incrementing fields.

Thanks Jacob Walls and Sarah Boyce for the reviews.

Backport of 07100db6f4 from main.
2025-04-30 10:54:17 -03:00
Simon Charette
7f6a5fbe2e [5.2.x] Fixed #36360 -- Fixed QuerySet.update() crash when referring annotations through values().
The issue was only manifesting itself when also filtering againt a related
model as that forces the usage of a subquery because SQLUpdateCompiler doesn't
support the UPDATE FROM syntax yet.

Regression in 65ad4ade74.

Refs #28900.

Thanks Gav O'Connor for the detailed report.

Backport of 8ef4e0bd42 from main.
2025-04-30 11:39:37 +02:00
koresi
231eb7acc3 [5.2.x] Fixed #35931 -- Documented fields and methods of the FlatPage model.
Co-authored-by: Clifford Gama <53076065+cliff688@users.noreply.github.com>

Backport of 0ee06c04e0 from main.
2025-04-27 16:12:47 +02:00
dbogar89
c08764cb2e [5.2.x] Fixed #36335 -- Fixed typo in docs/topics/db/managers.txt.
Backport of 7b394b9988 from main
2025-04-27 08:40:41 +02:00
nessita
90fa9f4cc0 [5.2.x] Fixed #36309 -- Made email alternatives and attachments pickleable.
Regression in aba0e541ca and in
d5bebc1c26.

Thanks Florent Messa for the report, and Jake Howard and Claude
Paroz for the review.

Backport of 0596263c31 from main.
2025-04-24 10:12:32 -03:00
nessita
7d80f70988 [5.2.x] Refs #36341 -- Added release notes for 5.1.9 and 4.2.21 for fix in wordwrap template filter.
Revision 1e9db35836 fixed a regression in
55d89e25f4, which also needs to be
backported to the stable branches in extended support (5.1.x and 4.2.x).

Backport of c86242d61f from main.
2025-04-23 17:28:00 -03:00
Matti Pohjanvirta
305aa4d0c5 [5.2.x] Fixed #36341 -- Preserved whitespaces in wordwrap template filter.
Regression in 55d89e25f4.

This work improves the django.utils.text.wrap() function to ensure that
empty lines and lines with whitespace only are kept instead of being
dropped.

Thanks Matti Pohjanvirta for the report and fix.

Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>

Backport of 1e9db35836 from main.
2025-04-23 16:18:55 -03:00
antoliny0919
97c93549fc [5.2.x] Fixed #36331 -- Reverted "Fixed #36055 -- Prevented overlap of object-tools buttons and page header in the admin."
This reverts commits b1324a680a and
02a5cbfe76. The former caused a regression
in admin sites that relied on the `object-tools` block being inside the
`content` block.

Thank you to Fabian Braun for the report.

Backport of 1bc805e23b from main.
2025-04-22 22:14:54 -03:00