Add exception for hyphenated hostname in validator so ip-range does n…

…ot get triggered as a false negative

flask_extras/forms/validators/network.py

@@ -1,3 +1,5 @@
+import re
+
 import socket
 
 from netaddr import iter_iprange
@@ -63,12 +65,13 @@ def valid_hosts(formcls, field):
     :param formcls (object): The form class.
     :param field (str): The list of ips.
     """
+    ip_range_re = re.compile(r'[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}')
     data = field.data
     if ',' in data:
         ips = [ip for ip in data.split(',') if ip]
     elif ' ' in data:
         ips = [ip for ip in data.split(' ') if ip]
-    elif '-' in data:
+    elif '-' in data and re.match(ip_range_re, data):
         try:
             start, end = data.split('-')
             ips = iter_iprange(start, end)

tests/test_validators.py

@@ -87,3 +87,26 @@ def test_valid_hosts_valid_list():
 def test_valid_hosts_valid_range():
     # Just ensuring it doesn't raise a ValueError
     network.valid_hosts(FakeCls(), Field(data='192.168.0.1-192.168.10.0'))
+
+
+def test_valid_hosts_valid_hyphen_no_ip():
+    # Just ensuring it doesn't raise a ValueError
+    network.valid_hosts(FakeCls(), Field(data='http://www.foo-bar.x.com'))
+
+
+def test_valid_hosts_valid_range_mixed():
+    # Just ensuring it doesn't raise a ValueError
+    network.valid_hosts(FakeCls(), Field(
+        data='192.168.0.1,http://www.foo.com'))
+
+
+def test_valid_hosts_valid_hyphenated_hostname_ip_mixed():
+    # Just ensuring it doesn't raise a ValueError
+    network.valid_hosts(FakeCls(), Field(
+        data='http://www.foo-bar.x.com,192.168.0.1'))
+
+
+def test_valid_hosts_valid_hyphenated_hostname_ip_mixed_range():
+    # Just ensuring it doesn't raise a ValueError
+    network.valid_hosts(FakeCls(), Field(
+        data='http://www.foo-bar.x.com,192.168.0.1-192.168.10.4'))