티스토리 수익 글 보기

티스토리 수익 글 보기

[1.6.x] Fixed DoS possibility in ModelMultipleChoiceField. · django/django@d7a06ee · GitHub
Skip to content
/ django Public

Commit d7a06ee

Browse files
committed
[1.6.x] Fixed DoS possibility in ModelMultipleChoiceField.
This is a security fix. Disclosure following shortly. Thanks Keryn Knight for the report and initial patch.
1 parent 553779c commit d7a06ee

File tree

3 files changed

+53
5
lines changed

3 files changed

+53
5
lines changed

django/forms/models.py

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,7 @@ def __init__(self, queryset, cache_choices=False, required=True,
11741174
def to_python(self, value):
11751175
if not value:
11761176
return []
1177-
to_py = super(ModelMultipleChoiceField, self).to_python
1178-
return [to_py(val) for val in value]
1177+
return list(self._check_values(value))
11791178

11801179
def clean(self, value):
11811180
if self.required and not value:
@@ -1184,7 +1183,29 @@ def clean(self, value):
11841183
return self.queryset.none()
11851184
if not isinstance(value, (list, tuple)):
11861185
raise ValidationError(self.error_messages['list'], code='list')
1186+
qs = self._check_values(value)
1187+
# Since this overrides the inherited ModelChoiceField.clean
1188+
# we run custom validators here
1189+
self.run_validators(value)
1190+
return qs
1191+
1192+
def _check_values(self, value):
1193+
"""
1194+
Given a list of possible PK values, returns a QuerySet of the
1195+
corresponding objects. Raises a ValidationError if a given value is
1196+
invalid (not a valid PK, not in the queryset, etc.)
1197+
"""
11871198
key = self.to_field_name or 'pk'
1199+
# deduplicate given values to avoid creating many querysets or
1200+
# requiring the database backend deduplicate efficiently.
1201+
try:
1202+
value = frozenset(value)
1203+
except TypeError:
1204+
# list of lists isn't hashable, for example
1205+
raise ValidationError(
1206+
self.error_messages['list'],
1207+
code='list',
1208+
)
11881209
for pk in value:
11891210
try:
11901211
self.queryset.filter(**{key: pk})
@@ -1203,9 +1224,6 @@ def clean(self, value):
12031224
code='invalid_choice',
12041225
params={'value': val},
12051226
)
1206-
# Since this overrides the inherited ModelChoiceField.clean
1207-
# we run custom validators here
1208-
self.run_validators(value)
12091227
return qs
12101228

12111229
def prepare_value(self, value):

docs/releases/1.6.10.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,12 @@ Note, however, that this view has always carried a warning that it is not
5858
hardened for production use and should be used only as a development aid. Now
5959
may be a good time to audit your project and serve your files in production
6060
using a real front-end web server if you are not doing so.
61+
62+
Database denial-of-service with ``ModelMultipleChoiceField``
63+
============================================================
64+
65+
Given a form that uses ``ModelMultipleChoiceField`` and
66+
``show_hidden_initial=True`` (not a documented API), it was possible for a user
67+
to cause an unreasonable number of SQL queries by submitting duplicate values
68+
for the field's data. The validation logic in ``ModelMultipleChoiceField`` now
69+
deduplicates submitted values to address this issue.

tests/model_forms/tests.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,6 +1381,27 @@ def test_with_data(self):
13811381
</select></p>
13821382
<p><label for="id_age">Age:</label> <input type="number" name="age" value="65" id="id_age" min="0" /></p>''' % (w_woodward.pk, w_bernstein.pk, bw.pk, w_royko.pk))
13831383

1384+
def test_show_hidden_initial_changed_queries_efficiently(self):
1385+
class WriterForm(forms.Form):
1386+
persons = forms.ModelMultipleChoiceField(
1387+
show_hidden_initial=True, queryset=Writer.objects.all())
1388+
1389+
writers = (Writer.objects.create(name=str(x)) for x in range(0, 50))
1390+
writer_pks = tuple(x.pk for x in writers)
1391+
form = WriterForm(data={'initial-persons': writer_pks})
1392+
with self.assertNumQueries(1):
1393+
self.assertTrue(form.has_changed())
1394+
1395+
def test_clean_does_deduplicate_values(self):
1396+
class WriterForm(forms.Form):
1397+
persons = forms.ModelMultipleChoiceField(queryset=Writer.objects.all())
1398+
1399+
person1 = Writer.objects.create(name="Person 1")
1400+
form = WriterForm(data={})
1401+
queryset = form.fields['persons'].clean([str(person1.pk)] * 50)
1402+
sql, params = queryset.query.sql_with_params()
1403+
self.assertEqual(len(params), 1)
1404+
13841405
def test_file_field(self):
13851406
# Test conditions when files is either not given or empty.
13861407

0 commit comments

Comments
 (0)