Skip to content
Permalink
Browse files

Fixed CVE-2020-7471 -- Properly escaped StringAgg(delimiter) parameter.

  • Loading branch information
charettes authored and carltongibson committed Dec 31, 2019
1 parent 6b178a3 commit eb31d845323618d688ad429479c6dda973056136
@@ -1,4 +1,5 @@
from django.contrib.postgres.fields import ArrayField, JSONField
from django.db.models import Value
from django.db.models.aggregates import Aggregate

from .mixins import OrderableAggMixin
@@ -51,11 +52,12 @@ def convert_value(self, value, expression, connection):

class StringAgg(OrderableAggMixin, Aggregate):
function = 'STRING_AGG'
template = "%(function)s(%(distinct)s%(expressions)s, '%(delimiter)s'%(ordering)s)"
template = '%(function)s(%(distinct)s%(expressions)s %(ordering)s)'
allow_distinct = True

def __init__(self, expression, delimiter, **extra):
super().__init__(expression, delimiter=delimiter, **extra)
delimiter_expr = Value(str(delimiter))
super().__init__(expression, delimiter_expr, **extra)

def convert_value(self, value, expression, connection):
if not value:
@@ -3,7 +3,7 @@

class OrderableAggMixin:

def __init__(self, expression, ordering=(), **extra):
def __init__(self, *expressions, ordering=(), **extra):
if not isinstance(ordering, (list, tuple)):
ordering = [ordering]
ordering = ordering or []
@@ -12,7 +12,7 @@ def __init__(self, expression, ordering=(), **extra):
(OrderBy(F(o[1:]), descending=True) if isinstance(o, str) and o[0] == '-' else o)
for o in ordering
)
super().__init__(expression, **extra)
super().__init__(*expressions, **extra)
self.ordering = self._parse_expressions(*ordering)

def resolve_expression(self, *args, **kwargs):
@@ -0,0 +1,13 @@
============================
Django 1.11.28 release notes
============================

*February 3, 2020*

Django 1.11.28 fixes a security issue in 1.11.27.

CVE-2020-7471: Potential SQL injection via ``StringAgg(delimiter)``
===================================================================

:class:`~django.contrib.postgres.aggregates.StringAgg` aggregation function was
subject to SQL injection, using a suitably crafted ``delimiter``.
@@ -0,0 +1,13 @@
===========================
Django 2.2.10 release notes
===========================

*February 3, 2020*

Django 2.2.10 fixes a security issue in 2.2.9.

CVE-2020-7471: Potential SQL injection via ``StringAgg(delimiter)``
===================================================================

:class:`~django.contrib.postgres.aggregates.StringAgg` aggregation function was
subject to SQL injection, using a suitably crafted ``delimiter``.
@@ -4,7 +4,13 @@ Django 3.0.3 release notes

*Expected February 3, 2020*

Django 3.0.3 fixes several bugs in 3.0.2.
Django 3.0.3 fixes a security issue and several bugs in 3.0.2.

CVE-2020-7471: Potential SQL injection via ``StringAgg(delimiter)``
===================================================================

:class:`~django.contrib.postgres.aggregates.StringAgg` aggregation function was
subject to SQL injection, using a suitably crafted ``delimiter``.

Bugfixes
========
@@ -42,6 +42,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1

2.2.10
2.2.9
2.2.8
2.2.7
@@ -100,6 +101,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1

1.11.28
1.11.27
1.11.26
1.11.25
@@ -169,6 +169,10 @@ def test_string_agg_requires_delimiter(self):
with self.assertRaises(TypeError):
AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field'))

def test_string_agg_delimiter_escaping(self):
values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter="'"))
self.assertEqual(values, {'stringagg': "Foo1'Foo2'Foo4'Foo3"})

def test_string_agg_charfield(self):
values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter=';'))
self.assertEqual(values, {'stringagg': 'Foo1;Foo2;Foo4;Foo3'})

0 comments on commit eb31d84

Please sign in to comment.
You can’t perform that action at this time.