mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Prevent mismatch of types in ranges

Browse Source
This commit is contained in:
Ryan Breaker
2017-10-24 19:30:43 -05:00
parent c107f35118
commit b295849f53
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/utilities/forms.py
View File

@ -39,7 +39,7 @@ COLOR_CHOICES = (
('111111', 'Black'), ('111111', 'Black'),
) )
NUMERIC_EXPANSION_PATTERN = '\[((?:\d+[?:,-])+\d+)\]' NUMERIC_EXPANSION_PATTERN = '\[((?:\d+[?:,-])+\d+)\]'
ALPHANUMERIC_EXPANSION_PATTERN = '\[((?:\w+[?:,-])+\w+)\]' ALPHANUMERIC_EXPANSION_PATTERN = '\[((?:[a-zA-Z0-9]+[?:,-])+[a-zA-Z0-9]+)\]'
IP4_EXPANSION_PATTERN = '\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]' IP4_EXPANSION_PATTERN = '\[((?:[0-9]{1,3}[?:,-])+[0-9]{1,3})\]'
IP6_EXPANSION_PATTERN = '\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]' IP6_EXPANSION_PATTERN = '\[((?:[0-9a-f]{1,4}[?:,-])+[0-9a-f]{1,4})\]'
@ -87,6 +87,8 @@ def parse_alphanumeric_range(string):
for dash_range in string.split(','): for dash_range in string.split(','):
try: try:
begin, end = dash_range.split('-') begin, end = dash_range.split('-')
if (str.isalpha(begin) and str.isdigit(end)) or (str.isdigit(begin) and str.isalpha(end)):
continue # Skip if it's invalid, just like any other bad pattern
except ValueError: except ValueError:
begin, end = dash_range, dash_range begin, end = dash_range, dash_range
nums = list(range(ord(begin), ord(end)+1)) nums = list(range(ord(begin), ord(end)+1))