Skip to content

Fixes #12639 - Make sure name expansions throws a validation error on decrementing ranges #13326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Fixes #12639 - Make sure name expansions throws a validation error on decrementing ranges #13326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d47dd7a
Fixes #12639 - Make sure name expansions throws a validation error on…
kkthxbye-code Jul 31, 2023
ab0df4b
Fix pep8
kkthxbye-code Aug 1, 2023
9972ed7
Also fail on equal start & end values
jeremystretch Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion netbox/dcim/forms/object_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ def clean(self):
super().clean()

# Validate that all replication fields generate an equal number of values
pattern_count = len(self.cleaned_data[self.replication_fields[0]])
if not (patterns := self.cleaned_data.get(self.replication_fields[0])):
return

pattern_count = len(patterns)
for field_name in self.replication_fields:
value_count = len(self.cleaned_data[field_name])
if self.cleaned_data[field_name] and value_count != pattern_count:
Expand Down
7 changes: 7 additions & 0 deletions netbox/utilities/forms/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ def parse_alphanumeric_range(string):
except ValueError:
begin, end = dash_range, dash_range
if begin.isdigit() and end.isdigit():
if int(begin) >= int(end):
raise forms.ValidationError(f'Range "{dash_range}" is invalid.')

for n in list(range(int(begin), int(end) + 1)):
values.append(n)
else:
Expand All @@ -71,6 +74,10 @@ def parse_alphanumeric_range(string):
# Not a valid range (more than a single character)
if not len(begin) == len(end) == 1:
raise forms.ValidationError(f'Range "{dash_range}" is invalid.')

if ord(begin) >= ord(end):
raise forms.ValidationError(f'Range "{dash_range}" is invalid.')

for n in list(range(ord(begin), ord(end) + 1)):
values.append(chr(n))
return values
Expand Down
5 changes: 3 additions & 2 deletions netbox/utilities/tests/test_forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,9 @@ def test_invalid_range_alphanumeric(self):
self.assertEqual(sorted(expand_alphanumeric_pattern('r[a-9]a')), [])

def test_invalid_range_bounds(self):
self.assertEqual(sorted(expand_alphanumeric_pattern('r[9-8]a')), [])
self.assertEqual(sorted(expand_alphanumeric_pattern('r[b-a]a')), [])
with self.assertRaises(forms.ValidationError):
sorted(expand_alphanumeric_pattern('r[9-8]a'))
sorted(expand_alphanumeric_pattern('r[b-a]a'))

def test_invalid_range_len(self):
with self.assertRaises(forms.ValidationError):
Expand Down