19 Dec
2017
19 Dec
'17
1:50 p.m.
Module: check_mk
Branch: master
Commit: 15df95883ca1c6a0f91be57f5b6d488f2edf0007
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15df95883ca1c6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 19 14:34:40 2017 +0100
Refactoring: Simplified IPv4Address/Network validation
Change-Id: I70b7cb8f6a984684c7b6b975c77d1809d87522b5
---
web/htdocs/valuespec.py | 56 +++++++++++++------------------------------------
1 file changed, 14 insertions(+), 42 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index d2c6090..d9cf42a 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -39,6 +39,7 @@ import math, os, time, re, sre_constants, urlparse, forms, tempfile,
types
import base64
import hashlib
import socket
+import ipaddress
from lib import *
import cmk.defines as defines
from Crypto.PublicKey import RSA
@@ -664,56 +665,27 @@ class IPv4Network(TextAscii):
TextAscii.__init__(self, **kwargs)
def validate_value(self, value, varprefix):
- if "/" in value:
- try:
- network, bits = value.split("/")
- bits = int(bits)
- except:
- raise MKUserError(varprefix, _("Please use the syntax
X.X.X.X/YY"))
- else:
- network = value
- bits = 32
-
- if bits < 0 or bits > 32:
- raise MKUserError(varprefix, _("Invalid number of bits. Must be in range
1 ... 32"))
+ super(IPv4Network, self).validate_value(value, varprefix)
- if value.count(".") != 3:
- raise MKUserError(varprefix, _("The network must contain three
dots"))
-
- octets = self.validate_ipaddress(network, varprefix)
-
- # Make sure that non-network bits are zero
- l = (octets[0] << 24) + (octets[1] << 16) + (octets[2] << 8) +
(octets[3])
- for b in range(bits, 32):
- if l & (2 ** (31-b)) != 0:
- raise MKUserError(varprefix, _("Please make sure that only the %d
non-network bits are non-zero") % bits)
-
- ValueSpec.custom_validate(self, value, varprefix)
-
-
- def validate_ipaddress(self, value, varprefix):
try:
- octets = map(int, value.split("."))
- if len(octets) != 4:
- raise MKUserError(varprefix, _("Please specify four octets
(X.X.X.X/YY)"))
- for o in octets:
- if o < 0 or o > 255:
- raise MKUserError(varprefix, _("Invalid octet %d (must be in
range 1 ... 255)") % o)
- return octets
- except MKUserError:
- raise
- except:
- raise MKUserError(varprefix, _("Invalid IP address syntax"))
+ ipaddress.IPv4Interface(value.decode("utf-8"))
+ except ValueError, e:
+ raise MKUserError(varprefix, _("Invalid IP network address: %s") %
e)
+
-class IPv4Address(IPv4Network):
+class IPv4Address(TextAscii):
def __init__(self, **kwargs):
kwargs.setdefault("size", 16)
- IPv4Network.__init__(self, **kwargs)
+ super(IPv4Address, self).__init__(**kwargs)
def validate_value(self, value, varprefix):
- self.validate_ipaddress(value, varprefix)
- ValueSpec.custom_validate(self, value, varprefix)
+ super(IPv4Address, self).validate_value(value, varprefix)
+ try:
+ ipaddress.IPv4Address(value.decode("utf-8"))
+ except ValueError, e:
+ raise MKUserError(varprefix, _("Invalid IP address: %s") % e)
+
class TextAsciiAutocomplete(TextAscii):