paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

realm filters: Make validation error messages more useful.

Browse Source
This commit is contained in:
Tim Abbott
2018-12-17 12:25:12 -08:00
parent 34e39248fc
commit c87a533b3b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/models.py
View File

@@ -565,7 +565,8 @@ post_delete.connect(flush_realm_emoji, sender=RealmEmoji)
def filter_pattern_validator(value: str) -> None: def filter_pattern_validator(value: str) -> None:
regex = re.compile(r'^(?:(?:[\w\-#_= /:]*|[+]|[!])(\(\?P<\w+>.+\)))+$') regex = re.compile(r'^(?:(?:[\w\-#_= /:]*|[+]|[!])(\(\?P<\w+>.+\)))+$')
error_msg = 'Invalid filter pattern, you must use the following format OPTIONAL_PREFIX(?P<id>.+)' error_msg = _('Invalid filter pattern. Valid characters are %s.' % (
'[ a-zA-Z_#=/:+!-]',))
if not regex.match(str(value)): if not regex.match(str(value)):
raise ValidationError(error_msg) raise ValidationError(error_msg)
@@ -580,8 +581,7 @@ def filter_format_validator(value: str) -> None:
regex = re.compile(r'^([\.\/:a-zA-Z0-9#_?=-]+%\(([a-zA-Z0-9_-]+)\)s)+[a-zA-Z0-9_-]*$') regex = re.compile(r'^([\.\/:a-zA-Z0-9#_?=-]+%\(([a-zA-Z0-9_-]+)\)s)+[a-zA-Z0-9_-]*$')
if not regex.match(value): if not regex.match(value):
raise ValidationError('URL format string must be in the following format: ' raise ValidationError(_('Invalid URL format string.'))
r'`https://example.com/%(\w+)s`')
class RealmFilter(models.Model): class RealmFilter(models.Model):
"""Realm-specific regular expressions to automatically linkify certain """Realm-specific regular expressions to automatically linkify certain

6
zerver/tests/test_realm_filters.py
View File

@@ -30,11 +30,11 @@ class RealmFilterTest(ZulipTestCase):
data['pattern'] = '$a' data['pattern'] = '$a'
result = self.client_post("/json/realm/filters", info=data) result = self.client_post("/json/realm/filters", info=data)
self.assert_json_error(result, 'Invalid filter pattern, you must use the following format OPTIONAL_PREFIX(?P<id>.+)') self.assert_json_error(result, 'Invalid filter pattern. Valid characters are [ a-zA-Z_#=/:+!-].')
data['pattern'] = r'ZUL-(?P<id>\d++)' data['pattern'] = r'ZUL-(?P<id>\d++)'
result = self.client_post("/json/realm/filters", info=data) result = self.client_post("/json/realm/filters", info=data)
self.assert_json_error(result, 'Invalid filter pattern, you must use the following format OPTIONAL_PREFIX(?P<id>.+)') self.assert_json_error(result, 'Invalid filter pattern. Valid characters are [ a-zA-Z_#=/:+!-].')
data['pattern'] = r'ZUL-(?P<id>\d+)' data['pattern'] = r'ZUL-(?P<id>\d+)'
data['url_format_string'] = '$fgfg' data['url_format_string'] = '$fgfg'
@@ -44,7 +44,7 @@ class RealmFilterTest(ZulipTestCase):
data['pattern'] = r'ZUL-(?P<id>\d+)' data['pattern'] = r'ZUL-(?P<id>\d+)'
data['url_format_string'] = 'https://realm.com/my_realm_filter/' data['url_format_string'] = 'https://realm.com/my_realm_filter/'
result = self.client_post("/json/realm/filters", info=data) result = self.client_post("/json/realm/filters", info=data)
self.assert_json_error(result, 'URL format string must be in the following format: `https://example.com/%(\\w+)s`') self.assert_json_error(result, 'Invalid URL format string.')
data['url_format_string'] = 'https://realm.com/my_realm_filter/#hashtag/%(id)s' data['url_format_string'] = 'https://realm.com/my_realm_filter/#hashtag/%(id)s'
result = self.client_post("/json/realm/filters", info=data) result = self.client_post("/json/realm/filters", info=data)