Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Backports:SLE-15-SP5:Update
python-Django1.18326
fix-cve-2023-36053.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-cve-2023-36053.patch of Package python-Django1.18326
diff --git a/django/core/validators.py b/django/core/validators.py index d8aaa64..079168a 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -107,6 +107,7 @@ class URLValidator(RegexValidator): message = _('Enter a valid URL.') schemes = ['http', 'https', 'ftp', 'ftps'] unsafe_chars = frozenset('\t\r\n') + max_length = 2048 def __init__(self, schemes=None, **kwargs): super(URLValidator, self).__init__(**kwargs) @@ -115,7 +116,9 @@ class URLValidator(RegexValidator): def __call__(self, value): value = force_text(value) - if isinstance(value, str) and self.unsafe_chars.intersection(value): + if not isinstance(value, str) or len(value) > self.max_length: + raise ValidationError(self.message, code=self.code, params={'value': value}) + if self.unsafe_chars.intersection(value): raise ValidationError(self.message, code=self.code) # Check first if the scheme is valid scheme = value.split('://')[0].lower() @@ -197,8 +200,9 @@ class EmailValidator(object): def __call__(self, value): value = force_text(value) - - if not value or '@' not in value: + # The maximum length of an email is 320 characters per RFC 3696 + # section 3. + if not value or '@' not in value or len(value) > 320: raise ValidationError(self.message, code=self.code) user_part, domain_part = value.rsplit('@', 1) diff --git a/django/forms/fields.py b/django/forms/fields.py index 7349076..c6f5c30 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -538,6 +538,9 @@ class EmailField(CharField): default_validators = [validators.validate_email] def __init__(self, *args, **kwargs): + # The default maximum length of an email is 320 characters per RFC 3696 + # section 3. + kwargs.setdefault("max_length", 320) super(EmailField, self).__init__(*args, strip=True, **kwargs) diff --git a/tests/forms_tests/field_tests/test_emailfield.py b/tests/forms_tests/field_tests/test_emailfield.py index 906a6cf..16d4600 100644 --- a/tests/forms_tests/field_tests/test_emailfield.py +++ b/tests/forms_tests/field_tests/test_emailfield.py @@ -11,7 +11,10 @@ class EmailFieldTest(FormFieldAssertionsMixin, SimpleTestCase): def test_emailfield_1(self): f = EmailField() - self.assertWidgetRendersTo(f, '<input type="email" name="f" id="id_f" required />') + self.assertEqual(f.max_length, 320) + self.assertWidgetRendersTo( + f, '<input type="email" name="f" id="id_f" maxlength="320" required>' + ) with self.assertRaisesMessage(ValidationError, "'This field is required.'"): f.clean('') with self.assertRaisesMessage(ValidationError, "'This field is required.'"): diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index ffad6f6..5234aa4 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -421,11 +421,18 @@ class FormsTestCase(SimpleTestCase): get_spam = BooleanField() f = SignupForm(auto_id=False) - self.assertHTMLEqual(str(f['email']), '<input type="email" name="email" required />') + self.assertHTMLEqual( + str(f["email"]), + '<input type="email" name="email" maxlength="320" required />', + ) self.assertHTMLEqual(str(f['get_spam']), '<input type="checkbox" name="get_spam" required />') f = SignupForm({'email': 'test@example.com', 'get_spam': True}, auto_id=False) - self.assertHTMLEqual(str(f['email']), '<input type="email" name="email" value="test@example.com" required />') + self.assertHTMLEqual( + str(f["email"]), + '<input type="email" name="email" maxlength="320" value="test@example.com" ' + "required />", + ) self.assertHTMLEqual( str(f['get_spam']), '<input checked type="checkbox" name="get_spam" required />', @@ -2771,7 +2778,7 @@ Good luck picking a username that doesn't already exist.</p> <option value="2">Yes</option> <option value="3">No</option> </select></li> -<li><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" /></li> +<li><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" maxlength="320" /></li> <li class="required error"><ul class="errorlist"><li>This field is required.</li></ul> <label class="required" for="id_age">Age:</label> <input type="number" name="age" id="id_age" required /></li>""" ) @@ -2787,7 +2794,7 @@ Good luck picking a username that doesn't already exist.</p> <option value="2">Yes</option> <option value="3">No</option> </select></p> -<p><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" /></p> +<p><label for="id_email">Email:</label> <input type="email" name="email" id="id_email" maxlength="320" /></p> <ul class="errorlist"><li>This field is required.</li></ul> <p class="required error"><label class="required" for="id_age">Age:</label> <input type="number" name="age" id="id_age" required /></p>""" @@ -2806,7 +2813,7 @@ Good luck picking a username that doesn't already exist.</p> <option value="3">No</option> </select></td></tr> <tr><th><label for="id_email">Email:</label></th><td> -<input type="email" name="email" id="id_email" /></td></tr> +<input type="email" name="email" id="id_email" maxlength="320" /></td></tr> <tr class="required error"><th><label class="required" for="id_age">Age:</label></th> <td><ul class="errorlist"><li>This field is required.</li></ul> <input type="number" name="age" id="id_age" required /></td></tr>""" @@ -3405,7 +3412,7 @@ Good luck picking a username that doesn't already exist.</p> f = CommentForm(data, auto_id=False, error_class=DivErrorList) self.assertHTMLEqual(f.as_p(), """<p>Name: <input type="text" name="name" maxlength="50" /></p> <div class="errorlist"><div class="error">Enter a valid email address.</div></div> -<p>Email: <input type="email" name="email" value="invalid" required /></p> +<p>Email: <input type="email" name="email" value="invalid" maxlength="320" required /></p> <div class="errorlist"><div class="error">This field is required.</div></div> <p>Comment: <input type="text" name="comment" required /></p>""") diff --git a/tests/validators/tests.py b/tests/validators/tests.py index 4ef8a52..634cd8f 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -63,6 +63,7 @@ TEST_DATA = [ (validate_email, 'example@atm.%s' % ('a' * 64), ValidationError), (validate_email, 'example@%s.atm.%s' % ('b' * 64, 'a' * 63), ValidationError), + (validate_email, "example@%scom" % (("a" * 63 + ".") * 100), ValidationError), (validate_email, None, ValidationError), (validate_email, '', ValidationError), (validate_email, 'abc', ValidationError), @@ -223,6 +224,11 @@ TEST_DATA = [ (URLValidator(EXTENDED_SCHEMES), 'git+ssh://git@github.com/example/hg-git.git', None), (URLValidator(EXTENDED_SCHEMES), 'git://-invalid.com', ValidationError), + ( + URLValidator(), + "http://example." + ("a" * 63 + ".") * 1000 + "com", + ValidationError, + ), # Trailing newlines not accepted (URLValidator(), 'http://www.djangoproject.com/\n', ValidationError), (URLValidator(), 'http://[::ffff:192.9.5.5]\n', ValidationError),
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
