10042 Commits

Author SHA1 Message Date
Baptiste Mispelon
7873d3757d [2.2.x] Fixed #31031 -- Fixed data loss in admin changelist view when formset's prefix contains regex special chars.
Regression in b18650a2634890aa758abae2f33875daa13a9ba3.

Backport of 52936efacec4df05df2d9872c09c3332335bf21b from master
2019-11-26 09:19:39 +01:00
Mariusz Felisiak
8eda248dc9 [2.2.x] Refs #29926 -- Bumped minimum tblib version to 1.5.0 in test requirements.
Backport of 25903e41fb45ce9cc80dc93bf4b51ea431dcb2b6 from master.
2019-11-12 21:49:09 +01:00
Carlton Gibson
785d1706c4 [2.2.x] Fixed #30931 -- Restored ability to override Model.get_FIELD_display().
Thanks Sergey Fedoseev for the implementation idea.

Regression in a68ea231012434b522ce45c513d84add516afa60.

Backport of 2d38eb0ab9f78d68c083a5b78b1eca39027b279a from master
2019-11-04 08:17:50 +01:00
Hannes Ljungberg
7fe09e6d41 [2.2.x] Fixed #30903 -- Fixed migrations crash on PostgreSQL when adding Index with opclasses and ordering.
Backport of fa5f3291e7f2611d53e64ab481ebe951b0161791 from master
2019-10-24 09:53:33 +02:00
Mariusz Felisiak
d2f02aa56b [2.2.x] Fixed #30870 -- Fixed showing that RunPython operations are irreversible by migrate --plan.
Thanks Hasan Ramezani for the initial patch and Kyle Dickerson for the
report.

Backport of 06d34aab7cfb1632a1538a243db81f24498525ff from master.
2019-10-14 11:45:47 +02:00
Louise Grandjonc
323467e286 [2.2.x] Fixed #30826 -- Fixed crash of many JSONField lookups when one hand side is key transform.
Regression in 6c3dfba89215fc56fc27ef61829a6fff88be4abb.

Backport of 7d1bf29977bb368d7c28e7c6eb146db3b3009ae7 from master
2019-10-11 11:52:32 +02:00
Pablo García
38af257988 [2.2.x] Fixed #30810 -- Fixed WatchmanReloaderTests.test_setting_timeout_from_environment_variable test.
client_timeout is an instance attribute.

Backport of 2fd610eb301dc01e100befed891e8007fd2e981f from master
2019-09-27 08:36:48 +02:00
Simon Charette
7806e45454 [2.2.x] Fixed #30769 -- Fixed a crash when filtering against a subquery JSON/HStoreField annotation.
This was a regression introduced by 7deeabc7c7526786df6894429ce89a9c4b614086
to address CVE-2019-14234.

Thanks Tim Kleinschmidt for the report and Mariusz for the tests.

Backport of 6c3dfba89215fc56fc27ef61829a6fff88be4abb from master
2019-09-16 08:53:31 +02:00
Simon Charette
964dd4f4f2 [2.2.x] Fixed #30754 -- Prevented inclusion of aliases in partial index conditions.
SQLite doesn't repoint table aliases in partial index conditions on table
rename which breaks the documented table alteration procedure.

Thanks Pēteris Caune for the report.

Backport of 34decdebf157b6f05836009cc1967f74ee541fdf from master
2019-09-10 10:04:12 +02:00
Mariusz Felisiak
6624a3de28
[2.2.x] Fixed test_json.TestQuerying.test_key_transform_expression() on Python 3.5. 2019-08-15 19:38:12 +02:00
zeyneloz
c2732e6839 [2.2.x] Fixed #30449 -- Fixed RelatedFieldListFilter/RelatedOnlyFieldListFilter to respect model's Meta.ordering.
Regression in 6d4e5feb79f7eabe8a0c7c4b87f25b1a7f87ca0b.

Co-Authored-By: Mariusz Felisiak <felisiak.mariusz@gmail.com>

Backport of 00035672a460b6eb5442d2837bc783f8af28c6f3 from master
2019-08-15 13:14:17 +02:00
Mariusz Felisiak
52a7759a49 [2.2.x] Fixed #30672 -- Fixed crash of JSONField/HStoreField key transforms on expressions with params.
Regression in 4f5b58f5cd3c57fee9972ab074f8dc6895d8f387.

Thanks Florian Apolloner for the report and helping with tests.

Backport of 1f8382d34d54061eddc41df6994e20ee38c60907 from master.
2019-08-14 15:29:13 +02:00
Adnan Umer
1265a26b2f [2.2.x] Fixed #30673 -- Relaxed system check for db_table collision when database routers are installed by turning the error into a warning.
Backport of 8d3519071ec001f763b70a3a1f98ae2e980bd552 from master.
2019-08-08 21:40:06 +02:00
Florian Apolloner
cf694e6852 [2.2.x] Fixed CVE-2019-14235 -- Fixed potential memory exhaustion in django.utils.encoding.uri_to_iri().
Thanks to Guido Vranken for initial report.
2019-07-29 11:06:54 +02:00
Mariusz Felisiak
4f5b58f5cd [2.2.x] Fixed CVE-2019-14234 -- Protected JSONField/HStoreField key and index lookups against SQL injection.
Thanks to Sage M. Abdullah for the report and initial patch.
Thanks Florian Apolloner for reviews.
2019-07-29 11:06:54 +02:00
Florian Apolloner
e34f3c0e9e [2.2.x] Fixed CVE-2019-14233 -- Prevented excessive HTMLParser recursion in strip_tags() when handling incomplete HTML entities.
Thanks to Guido Vranken for initial report.
2019-07-29 11:06:54 +02:00
Florian Apolloner
c3289717c6 [2.2.X] Fixed CVE-2019-14232 -- Adjusted regex to avoid backtracking issues when truncating HTML.
Thanks to Guido Vranken for initial report.
2019-07-29 11:00:01 +02:00
Tom Forbes
4d6449e125 [2.2.x] Fixed #30647 -- Fixed crash of autoreloader when extra directory cannot be resolved.
Backport of fc75694257b5bceab82713f84fe5a1b23d641c3f from master.
2019-07-24 14:38:24 +02:00
Tom Forbes
2d2859bec2 [2.2.x] Fixed #30506 -- Fixed crash of autoreloader when path contains null characters.
Backport of 2ff517ccb6116c1be6338e6bdcf08a313defc5c7 from master.
2019-07-23 10:41:50 +02:00
Mariusz Felisiak
1088a9777d [2.2.x] Fixed #30621 -- Fixed crash of __contains lookup for Date/DateTimeRangeField when the right hand side is the same type.
Thanks Tilman Koschnick for the report and initial patch.
Thanks Carlton Gibson for the review.

Regression in 6b048b364ca1e0e56a0d3815bf2be33ac9998355.
Backport of 7991111af12056ec9a856f35935d273526338c1f from master
2019-07-10 10:34:49 +02:00
Simon Charette
9dee8515d6 [2.2.x] Fixed #30628 -- Adjusted expression identity to differentiate bound fields.
Expressions referring to different bound fields should not be
considered equal.

Thanks Julien Enselme for the detailed report.

Regression in bc7e288ca9554ac1a0a19941302dea19df1acd21.

Backport of ee6e93ec8727d0f5ed33190a3c354867669ed72f from master
2019-07-10 08:04:45 +02:00
Carlton Gibson
77706a3e47 [2.2.x] Fixed CVE-2019-12781 -- Made HttpRequest always trust SECURE_PROXY_SSL_HEADER if set.
An HTTP request would not be redirected to HTTPS when the
SECURE_PROXY_SSL_HEADER and SECURE_SSL_REDIRECT settings were used if
the proxy connected to Django via HTTPS.

HttpRequest.scheme will now always trust the SECURE_PROXY_SSL_HEADER if
set, rather than falling back to the request scheme when the
SECURE_PROXY_SSL_HEADER did not have the secure value.

Thanks to Gavin Wahl for the report and initial patch suggestion, and
Shai Berger for review.

Backport of 54d0f5e62f54c29a12dd96f44bacd810cbe03ac8 from master
2019-07-01 07:50:48 +02:00
Mariusz Felisiak
395cf7c375 [2.2.x] Fixed GeoIPTest.test04_city() failure with the latest GeoIP2 database.
Backport of 4305fbe8b11f44ab5d6759346488026c1e9677b2 from master
2019-06-30 19:46:40 +02:00
Tom Forbes
bdc1de2199 [2.2.x] Fixed #30588 -- Fixed crash of autoreloader when __main__ module doesn't have __file__ attribute.
Backport of 8454f6dea49dddb821bfcb7569ea222bb487dfd1 from master
2019-06-26 06:44:57 +02:00
Étienne Beaulé
4e6f0024f1 [2.2.x] Fixed #30542 -- Fixed crash of numerical aggregations with filter.
Filters in annotations crashed when used with numerical-type
aggregations (i.e. Avg, StdDev, and Variance). This was caused as the
source expressions no not necessarily have an output_field (such as the
filter field), which lead to an AttributeError: 'WhereNode' object has
no attribute output_field.

Thanks to Chuan-Zheng Lee for the report.

Regression in c690afb873cac8035a3cb3be7c597a5ff0e4b261 and two following
commits.

Backport of 4b6dfe16226a81fea464ac5f77942f4d6ba266e8 from master.
2019-06-05 09:15:21 +02:00
Carlton Gibson
afddabf842 [2.2.x] Fixed CVE-2019-12308 -- Made AdminURLFieldWidget validate URL before rendering clickable link.
Backport of deeba6d92006999fee9adfbd8be79bf0a59e8008 from master.
2019-06-03 11:37:28 +02:00
Tom Forbes
7089502b98 [2.2.x] Fixed #30523 -- Fixed updating file modification times on seen files in auto-reloader when using StatReloader.
Previously we updated the file mtimes if the file has not been seen
before - i.e on the first iteration of the loop.

If the mtime has been changed we triggered the notify_file_changed()
method which in all cases except the translations will result in the
process being terminated. To be strictly correct we need to update the
mtime for either branch of the conditional.

Regression in 6754bffa2b2df15a741008aa611c1bb0e8dff22b.

Backport of 480492fe70b0bb7df61c00854dc8535c9d21ba64 from master
2019-05-29 09:43:10 +02:00
Tom Forbes
ace0bec804 [2.2.x] Fixed #30516 -- Fixed crash of autoreloader when re-raising exceptions with custom signature.
Regression in c8720e7696ca41f3262d5369365cc1bd72a216ca.

Backport of 0344565179527d80990e2247e3be7c04aa8c43c8 from master
2019-05-29 08:30:22 +02:00
Caio Ariede
1172f078eb [2.2.x] Fixed #30315 -- Fixed crash of ArrayAgg and StringAgg with ordering when used in Subquery.
Backport of a3f91891d2c7f4bdc33f48ae70820ef6f36da26e from master.
2019-05-28 10:39:28 +02:00
Tom Forbes
5bf2c87ece [2.2.x] Fixed #30479 -- Fixed detecting changes in manage.py by autoreloader when using StatReloader.
Regression in c8720e7696ca41f3262d5369365cc1bd72a216ca.

Backport of b2790f74d4f38c8b297b7c1cef6875d2378f6fa6 from master
2019-05-28 09:01:29 +02:00
Thomasina Lee
3d4e53bcb1 [2.2.x] Fixed #30488 -- Removed redundant Coalesce call in SQL generated by SearchVector.
Regression in 405c8363362063542e9e79beac53c8437d389520.

Backport of c38e7a79f4354ee831f92deb7a658fc0387e3bec from master
2019-05-20 09:12:32 +02:00
ruchit2801
db7d7901ee [2.2.x] Fixed #30463 -- Fixed crash of deprecation message when Meta.ordering contains expressions.
Regression in 1b1f64ee5a78cc217fead52cbae23114502cf564.

Backport of 04042b2b440f0bf50eb908d52cfe76af430e1738 from master
2019-05-18 20:05:31 +02:00
Claude Paroz
34a357d519 [2.2.x] Fixed #30459 -- Delegated hide/show JS toggle to parent div.
Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>

Backport of e286987a27271c8ee7eb6e4d4332b563c4e6094b from master
2019-05-17 08:04:59 +02:00
can
58391b4d16 [2.2.x] Fixed #30412 -- Fixed crash when adding check constraints with OR'ed condition on Oracle and SQLite.
Backport of 719b7466203181066d9537d2e3bec687dffc9f41 from master
2019-04-30 13:43:02 +02:00
Simon Charette
f36239fa19 [2.2.x] Fixed #30408 -- Fixed crash when adding check constraints with LIKE operator on Oracle and PostgreSQL.
The LIKE operator wildcard generated for contains, startswith, endswith and
their case-insensitive variant lookups was conflicting with parameter
interpolation on CREATE constraint statement execution.

Ideally we'd delegate parameters interpolation in DDL statements on backends
that support it but that would require backward incompatible changes to the
Index and Constraint SQL generating methods.

Thanks David Sanders for the report.

Backport of a8b3f96f6acfa082f99166e0a1cfb4b0fbc0eace from master
2019-04-30 08:54:30 +02:00
Tom Forbes
d326c743ef [2.2.x] Fixed #30323 -- Fixed detecting changes by autoreloader when using StatReloader.
Backport of 6754bffa2b2df15a741008aa611c1bb0e8dff22b from master
2019-04-29 12:18:29 +02:00
Carlton Gibson
4f8ebdd098 [2.2.x] Fixed #30351 -- Handled pre-existing permissions in proxy model permissions data migration.
Regression in 181fb60159e54d442d3610f4afba6f066a6dac05.

Backport of 98296f86b340c8c9c968375d59f1d3a3479e60c2 from master
2019-04-27 21:08:46 +02:00
Jacob Green
e45763193f [2.2.x] Fixed #30361 -- Increased the default timeout of watchman client to 5 seconds and made it customizable.
Made the default timeout of watchman client customizable via
DJANGO_WATCHMAN_TIMEOUT environment variable.

Backport of ed3c59097a01ed3f32f8a8bed95307fb5c181251 from master
2019-04-26 13:35:47 +02:00
Aarni Koskela
a4095dadc4 [2.2.x] Fixed #30312 -- Relaxed admin check from django.contrib.sessions to SessionMiddleware subclasses.
Backport of efeceba589974b95b35b2e25df86498c96315518 from master
2019-04-26 11:51:28 +02:00
Alasdair Nicol
3c3df7db8e [2.2.x] Fixed #30318 -- Added check for importability of arguments of custom error handler views.
Thanks to Jon on Stack Overflow for reporting the issue.

Backport of a5accc0368c6575b55976c06af36ed399c85c781 from master
2019-04-25 11:38:35 +02:00
Simon Charette
88bf635c35 [2.2.x] Fixed #30385 -- Restored SearchVector(config) immutability.
Regression in 1a28dc3887e8d66d5e3ff08cf7fb0a6212b873e5.

The usage of CONCAT to allow SearchVector to deal with non-text fields
made the generated expression non-IMMUTABLE which prevents a functional
index to be created for it.

Using a combination of COALESCE and ::text makes sure the expression
preserves its immutability.

Refs #29582. Thanks Andrew Brown for the report, Nick Pope for the
review.

Backport of 405c8363362063542e9e79beac53c8437d389520 from master
2019-04-23 08:32:36 +02:00
Scott Fitsimones
95811c3de9 [2.2.x] Fixed #30328 -- Fixed crash of IntegerField.validators when limit_value in a custom validator is callable.
Backport of a14c0fda15db7e0eb982ac7b68d47b45fc95b4cb from master
2019-04-19 08:21:29 +02:00
Mariusz Felisiak
bb54a2daee
[2.2.x] Removed unused imports. 2019-04-18 07:49:35 +02:00
can
e85317d731 [2.2.x] Fixed #30335, #29139 -- Fixed crash when ordering or aggregating over a nested JSONField key transform.
Backport of d87bd29c4f8dfcdf3f4a4eb8340e6770a2416fe3 from master.
2019-04-18 07:37:48 +02:00
Tobias Kunze
5289d4faec [2.2.x] Refs #30325 -- Added tests for using count()/exists() with custom managers and reverse M2M relations.
Backport of 9ac8520fcde29840a1345be19d80dbda53aa6d03 from master
2019-04-15 12:39:56 +02:00
Mariusz Felisiak
e8de1cc94c [2.2.x] Fixed #30325 -- Reverted "Fixed #29725 -- Removed unnecessary join in QuerySet.count() and exists() on a many-to-many relation."
This reverts commit 1299421cadc4fcf63585f2f88337078e43e660e0 due to
a regression with custom managers.

Backport of 5f7991c42cff73b6278106d499d719b726f85ead from master
2019-04-15 12:39:42 +02:00
Florian Apolloner
896cc71901
[2.2.x] Fixed #30350 -- Prevented recreation of migration for operations with a range object.
Thanks to Mariusz Felisiak for helping with the patch.

Backport of 2e38f2015aba224b68a91a3012b87223f3046bb6 from master.
2019-04-14 12:58:34 +02:00
Florian Apolloner
b88ffef7ea [2.2.x] Fixed #30330 -- Fixed setting of primary key to None during fast-delete.
Regression in bc7dd8490b882b2cefdc7faf431dc64c532b79c9.

Backport of afc708cf6d047b35db57bd7c55baeffef459d279 from master
2019-04-08 21:44:17 +02:00
Simone Pellizzari
268ed9cd8a [2.2.x] Fixed #30332 -- Fixed crash of ordering by expressions with params in ArrayAgg and StringAgg.
Backport of d0315584b5ed6a47b486e65f6c88f80189f337ef from master.
2019-04-06 15:15:40 +02:00
Nick Pope
9da25fb832 [2.2.x] Fixed #30324 -- Forced utf-8 encoding when loading the template for the technical 500 debug page.
Regression in 50b8493.
Related to ea542a9.

Backport of efb257a01764855a71051d5bcc7fd66c5ad6d210 from master
2019-04-05 16:37:22 +02:00