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

Fixes #2181: Raise validation error on invalid prefix_length when allocating next-available prefix

Browse Source
This commit is contained in:
Jeremy Stretch
2018-06-29 15:10:30 -04:00
parent d98aa03e9d
commit af54d96d30
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/ipam/api/views.py
View File

@ -4,7 +4,7 @@ from django.conf import settings
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from rest_framework import status from rest_framework import status
from rest_framework.decorators import detail_route from rest_framework.decorators import detail_route
from rest_framework.exceptions import PermissionDenied from rest_framework.exceptions import PermissionDenied, ValidationError
from rest_framework.response import Response from rest_framework.response import Response
from extras.api.views import CustomFieldModelViewSet from extras.api.views import CustomFieldModelViewSet
@ -98,7 +98,23 @@ class PrefixViewSet(CustomFieldModelViewSet):
requested_prefixes = request.data if isinstance(request.data, list) else [request.data] requested_prefixes = request.data if isinstance(request.data, list) else [request.data]
# Allocate prefixes to the requested objects based on availability within the parent # Allocate prefixes to the requested objects based on availability within the parent
for requested_prefix in requested_prefixes: for i, requested_prefix in enumerate(requested_prefixes):
# Validate requested prefix size
if 'prefix_length' not in requested_prefix:
raise ValidationError("Item {}: prefix_length field missing".format(i))
elif not isinstance(requested_prefix['prefix_length'], int):
raise ValidationError("Item {}: Invalid prefix length ({})".format(
i, requested_prefix['prefix_length']
))
elif prefix.family == 4 and requested_prefix['prefix_length'] > 32:
raise ValidationError("Item {}: Invalid prefix length ({}) for IPv4".format(
i, requested_prefix['prefix_length']
))
elif prefix.family == 6 and requested_prefix['prefix_length'] > 128:
raise ValidationError("Item {}: Invalid prefix length ({}) for IPv6".format(
i, requested_prefix['prefix_length']
))
# Find the first available prefix equal to or larger than the requested size # Find the first available prefix equal to or larger than the requested size
for available_prefix in available_prefixes.iter_cidrs(): for available_prefix in available_prefixes.iter_cidrs():