1
0
mirror of https://github.com/django/django.git synced 2025-06-15 00:19:12 +00:00

33449 Commits

Author SHA1 Message Date
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 c075508b4de8edf9db553b409f8a8ed2f26ecead.

Backport of cf5f36bf903a2854f5e395149cee707115b83744 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 00c690efbc0b10f67924687f24a7b30397bf47d9.

Thanks to David Sanders and Simon Charette for reviews.

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

Backport of c1fa3fdd040718356e5a3b9a0fe699d73f47a940 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 957951755259b412d5113333b32bf85871d29814 from main.
2025-06-06 09:07:12 -03:00
Natalia
9d7fc9eb1c [5.2.x] Refs CVE-2025-48432 -- Made SuspiciousOperation logging use log_response() for consistency.
Backport of ff835f439cb1ecd8d74a24de12e3c03e5477dc9d from main.
2025-06-06 09:07:06 -03:00
Natalia
c042af7147 [5.2.x] Refactored logging_tests to reuse assertions for log records.
Backport of 9d72e7daf7299ef1ece56fd657a02f77a469efe9 from main.
2025-06-06 09:06:57 -03:00
Sarah Boyce
5901cfe591 [5.2.x] Updated translations from Transifex. 2025-06-06 13:55:05 +02:00
Natalia
f11fb10766 [5.2.x] Improved "fetch" translations helper to restrict the resulting set by date.
Backport of e715b07cf32f9d913f10efe87db7b4b0d793237a from main.
2025-06-05 12:04:50 -03:00
Natalia
48a82d44d8 [5.2.x] Added CVE-2025-48432 to security archive.
Backport of 51923c576a596ad00214e44028f9dee9748bce95 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 1f19c36e2d57607b82476cc90bc881ac2586d2d5 from main.
2025-06-04 10:56:00 -03:00
Natalia
16892c92f5 [5.2.x] Post-release version bump. 2025-06-04 08:45:21 -03:00
Natalia
9e2fe65967 [5.2.x] Bumped version for 5.2.2 release. 5.2.2 2025-06-04 08:38:55 -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 a07ebec5591e233d8bbb38b7d63f35c5479eef0e 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 626d77e52a3f247358514bcf51c761283968099c.

Refs #36116.

Thanks Cornelis Poppema for the excellent report.

Backport of 08187c94ed02c45ad40a32244dedeaa7ac71ca87 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 c075508b4de8edf9db553b409f8a8ed2f26ecead 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 26313bc21932d0d3af278ab387549d63b1f64575 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 857b1048d53ebf5fc5581c110e85c212b81ca83a.

Backport of 90429625a85f1f77dfea200c91bd2dabab57974f 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 1a744343999c9646912cee76ba0a2fa6ef5e6240 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 1307b8a1cb05762147736d0f347792b33f645390 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 c2615a050036eda0bca090c707191076220cee9f 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 a76035e925ff4e6d8676c65cb135c74b993b1039.
Thank you to Simon Charette for the review.

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

Backport of b8e5a8a9a2a767f584cbe89a878a42363706f939 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 d2732c30af28381f5a2ff1b08f754eeb7a6dfeca 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 50f89ae850f6b4e35819fe725a08c7e579bfd099.
Thank you to shamoon for the report and Natalia Bidart for the review.

Backport of 1704c49a9b149b66b6a0e67abc8c95293bc35649 from main.
2025-05-23 10:24:09 +02:00
Natalia
cdd374939a [5.2.x] Added helpers in csrf_tests and logging_tests to assert logs from log_response().
Backport of ad6f99889838ccc2c30b3c02ed3868c9b565e81b from main.
2025-05-22 15:41:13 -03:00
Natalia
2c8358343a [5.2.x] Refs #26688 -- Added tests for log_response() internal helper.
Backport of 897046815944cc9a2da7ed9e8082f45ffe8110e3 from main.
2025-05-22 15:40:42 -03:00
Colleen Dunlap
787f3130f7 [5.2.x] Fixed #36388 -- Made QuerySet.union() return self when called with no arguments.
Regression in 9cb8baa0c4fa2c10789c5c8b65f4465932d4d172.
Thank you to Antoine Humeau for the report and Simon Charette for the review.

Backport of 802baf5da5b8d8b44990a8214a43b951e7ab8b39 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 994dc6d8a1bae717baa236b65e11cf91ce181c53 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 a79c411147800a60169ea943545686cd9261cdc5 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 e52100a2508ecbb105926128ce80f4ef04bb3c95 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 188799e67c2c497419f448359775930c866fe28d 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 8be0c0d6901669661fca578f474cd51cd284d35a 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 42ab99309d347f617d60751c2e8d627fb2963049 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 c86156378db09e68db3a9ae1c108f661a67e3abe 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 37f2a77c729ccb71059c8e66c49b07499d2edf60 from main.
2025-05-07 11:37:09 -03:00
Natalia
98cb9d0608 [5.2.x] Added CVE-2025-32873 to security archive.
Backport of fdabda4e05587347aeb3382a442d7e77c1a0c3e5 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 d8397bf6cd01460a8f8a1ec5fb39b23ac780da7a from main.
2025-05-07 10:56:41 -03:00
Natalia
13b71c9794 [5.2.x] Post-release version bump. 2025-05-06 22:30:31 -03:00
Natalia
bc833e8883 [5.2.x] Bumped version for 5.2.1 release. 5.2.1 2025-05-06 22:26:17 -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 9f3419b519799d69f2aba70b9d25abe2e70d03e0 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 f7d97dd11819be8996798a7197c5695a317334a0 from main.
2025-05-06 11:13:07 -03:00
Mariusz Felisiak
44bda7a674 [5.2.x] Refs #36052, #32234 -- Fixed inspectdb tests for CompositePrimaryKey on Oracle.
Tests regression in 4c75858135589f3a00e32eb4d476074536371a32.
Backport of dd133054cb98f77577c06d7ef1f2391a865784bc from main
2025-05-06 08:21:32 +02: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 9d93e35c207a001de1aa9ca9165bdec824da9021 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 0f5dd0dff3049189a3fe71a62670b746543335d5 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 66f9eb0ff1e7147406318c5ba609729678e4e6f6 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 07100db6f46255ec6ef70b860495f977473684d6 from main.
2025-04-30 10:54:17 -03:00
Simon Charette
5d03c71b7a [5.2.x] Refs #36052, #32234 -- Removed create_test_table_with_composite_primary_key flag in favor of using CompositePrimaryKey.
Now that Django properly supports creating models with composite primary
keys, the tests should use a `CompositePrimaryKey` field instead of a
feature flag to inline backend specific SQL for creating a composite PK.

Specifcially, the inspectdb's test_composite_primary_key was adjusted to
use schema editor instead of per-backend raw SQL.

Backport of 4c75858135589f3a00e32eb4d476074536371a32 from main.
2025-04-30 10:53:39 -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 65ad4ade74dc9208b9d686a451cd6045df0c9c3a.

Refs #28900.

Thanks Gav O'Connor for the detailed report.

Backport of 8ef4e0bd423ac3764004c73c3d1098e7a51a2945 from main.
2025-04-30 11:39:37 +02:00
Baptiste Mispelon
af241dfa7d [5.2.x] Used addCleanup() instead of try-finally blocks in inspectdb tests.
Backport of 2722cb61ccae84f593e6d2c28814e3c628743994 from main.
2025-04-29 13:46:06 -03: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 0ee06c04e0256094270db3ffe8b5dafa6a8457a3 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 7b394b9988b986429a4da4e60416e0f08ff649e5 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 aba0e541caaa086f183197eaaca0ac20a730bbe4 and in
d5bebc1c26d4c0ec9eaa057aefc5b38649c0ba3b.

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

Backport of 0596263c3136bc26cffa670e5322bd0aa56c4d34 from main.
2025-04-24 10:12:32 -03:00