1
0
mirror of https://github.com/django/django.git synced 2025-07-14 22:59:11 +00:00

3247 Commits

Author SHA1 Message Date
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
Carlton Gibson
ea57c8a345 [2.2.x] Added stub release notes for security releases.
Backport of f13147c8de725eed7038941758469aeb9bd66503 from master
2019-07-25 10:50:18 +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
Mariusz Felisiak
b593c39d7f [2.2.x] Added stub release notes for 2.2.4.
Backport of 08e69cad9ccb18738b66388b0d0ee4660470710e from master
2019-07-09 07:45:27 +02:00
Mariusz Felisiak
2b533ae60e [2.2.x] Added CVE-2019-12781 to the security release archive.
Backport of 868cd56f058ca203419ad0886353173b74c3bcf1 from master
2019-07-01 10:21:16 +02:00
Mariusz Felisiak
4f2713ff0e [2.2.x] Added release date for 2.2.3.
Backport of fc41401f33045d2015dd92e735a13e5ee4af3afd from master
2019-07-01 07:51:53 +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
db9f7b44fc [2.2.x] Added stub release notes for security releases.
Backport of 30b3ee9d0b33bb440f9c73d1ce9e0e7303887a9f from master
2019-07-01 07:03:03 +02:00
Claude Paroz
b3f7262e6e [2.2.x] Updated translations from Transifex 2019-06-29 16:15:53 +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
Jon Dufresne
e6b2471ce7 [2.2.x] Fixed typos in 1.11.19, 2.0.11, 2.1.6 release notes.
Backport of 2ef6f209f79b0bd27d53405f0d46bb9ab82b2a52 from master
2019-06-21 07:10:32 +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
Mariusz Felisiak
ca3f86288a [2.2.x] Added stub release notes for 2.2.3.
Backport of 1f81e2df69c0f62f9bd85bca5b3876a2d8229fde from master
2019-06-05 06:58:53 +02:00
Nick Pope
ed3dc5119b [2.2.x] Added CVE-2019-12308 to the security release archive.
Backport of 21b1d239125f1228e579b1ce8d94d4d5feadd2a6 from master
2019-06-03 21:45:58 +02:00
Nick Pope
162e02b5e4 [2.2.x] Added CVE-2019-11358 to the security release archive.
Backport of 8fb0ea55830321852a4a051a478f78e24d4f6889 from master
2019-06-03 21:45:41 +02:00
Mariusz Felisiak
e6d7641000 [2.2.x] Fixed typos in 1.11.21, 2.1.9, 2.2.2 release notes.
Backport of 100ec901aebebe56b61f101af38a228414098dd5 from master
2019-06-03 14:10:51 +02:00
Carlton Gibson
baaf187a4e [2.2.x] Applied jQuery patch for CVE-2019-11358.
Backport of 34ec52269ade54af31a021b12969913129571a3f from master.
2019-06-03 11:38:57 +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
Carlton Gibson
4a1d25b39f [2.2.x] Added stub release notes for security releases.
Backport of 98c0fe19ee2cba9726708ac9336e1dc0d43cca69 from master
2019-06-03 10:50:09 +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
Mariusz Felisiak
5d1cf9c442 [2.2.x] Added stub release notes for 2.2.2.
Backport of 30dd43884e8e5dfb3dfd7e31fc78fd569f15916a from master
2019-05-08 14:45:37 +02:00
Mariusz Felisiak
e7629cecde [2.2.x] Added release date for 2.2.1.
Backport of 2106b983c433586925df12cdca72374829756e45 from master
2019-05-01 07:07:19 +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
Tom Forbes
097457afe4 [2.2.x] Refs #30323 -- Prevented crash of autoreloader when get_resolver().urlconf_module raising an exception.
Backport of 0636d4d2aa6e4469198fdf662225ad862e60c5e3 from master
2019-04-29 12:18:18 +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
Mariusz Felisiak
ba20579106 [2.2.x] Made cosmetic edits in docs/releases/2.2.1.txt.
Backport of 753580ecd17de62fa8ab9cd43c4cd0b986f9e348 from master
2019-04-19 08:29:23 +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
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
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
Tim Graham
53c83387cf [2.2.x] Refs #27807 -- Removed docs for User.username_validator.
The new override functionality claimed in refs #21379 doesn't work.
Forwardport of 714fdbaa7048c2321f6238d9421137c33d9af7cc from stable/1.10.x.
2019-04-07 20:03:01 -04:00