summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorNick Malakhov <n.malahov@inlinetelecom.ru>2016-02-12 15:26:45 +0300
committerTim Graham <timograham@gmail.com>2016-02-25 18:52:50 -0500
commitee69789f4546cc07b4ea85d03eb5bb6261673198 (patch)
tree4f26c75250c7ec50ef6a2e85482fbe907ecaf20d /django
parent22d2a5b00ac99e638d95cbfe1cc41ef217fa50d4 (diff)
Fixed #26269 -- Prohibited spaces in is_valid_ipv6_address().
Diffstat (limited to 'django')
-rw-r--r--django/utils/ipv6.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/utils/ipv6.py b/django/utils/ipv6.py
index a0cd606043..4f433d198b 100644
--- a/django/utils/ipv6.py
+++ b/django/utils/ipv6.py
@@ -1,6 +1,8 @@
# This code was mostly based on ipaddr-py
# Copyright 2007 Google Inc. https://github.com/google/ipaddr-py
# Licensed under the Apache License, Version 2.0 (the "License").
+import re
+
from django.core.exceptions import ValidationError
from django.utils.six.moves import range
from django.utils.translation import ugettext_lazy as _
@@ -155,6 +157,10 @@ def is_valid_ipv6_address(ip_str):
"""
from django.core.validators import validate_ipv4_address
+ symbols_re = re.compile(r'^[0-9a-fA-F:.]+$')
+ if not symbols_re.match(ip_str):
+ return False
+
# We need to have at least one ':'.
if ':' not in ip_str:
return False