T395: Implement a numeric value validator

2 files changed, 68 insertions, 0 deletions

diff --git a/debian/rules b/debian/rules
index d6d26c5c5..5c3aab7f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 DIR := debian/vyos-1x
 VYOS_SBIN_DIR := opt/vyatta/sbin/
+VYOS_LIBEXEC_DIR := opt/vyatta/libexec
 VYOS_CFG_TMPL_DIR := /opt/vyatta/share/vyatta-cfg/templates
 
 %:
@@ -14,8 +15,13 @@ override_dh_auto_install:
 	dh_install -pvyos-1x
 	cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
 
+	# Install configuration scripts
 	mkdir -p $(DIR)/$(VYOS_SBIN_DIR)
 	cp -r src/conf-mode/* $(DIR)/$(VYOS_SBIN_DIR)
 
+	# Install validators
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+	cp -r src/validators/* $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+
 	mkdir -p $(DIR)/$(VYOS_CFG_TMPL_DIR)
 	cp -r templates/* $(DIR)/$(VYOS_CFG_TMPL_DIR)
diff --git a/src/validators/numeric b/src/validators/numeric
new file mode 100755
index 000000000..58a4fac38
--- /dev/null
+++ b/src/validators/numeric
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+#
+# numeric value validator
+#
+# Copyright (C) 2017 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import argparse
+import re
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-f", "--float", action="store_true", help="Accept floating point values")
+group = parser.add_mutually_exclusive_group()
+group.add_argument("-r", "--range", type=str, help="Check if the number is within range (inclusive), example: 1024-65535")
+group.add_argument("-n", "--non-negative", action="store_true", help="")
+parser.add_argument("number", type=str, help="Number to validate")
+
+args = parser.parse_args()
+
+# Try to load the argument
+number = None
+if args.float:
+    try:
+        number = float(args.number)
+    except:
+        print("{0} is not a valid floating point number".format(args.number), file=sys.stderr)
+        sys.exit(1)
+else:
+    try:
+        number = int(args.number)
+    except:
+        print("{0} is not a valid integer number".format(args.number), file=sys.stderr)
+        sys.exit(1)
+
+if args.range:
+    try:
+        lower, upper = re.match(r'(\d+)\s*\-\s*(\d+)', args.range).groups()
+        lower, upper = int(lower), int(upper)
+    except:
+        print("{0} is not a valid number range",format(args.range), file=sys.stderr)
+        sys.exit(1)
+
+    if (number < lower) or (number > upper):
+        print("Number {0} is not in the {1} range".format(number, args.range), file=sys.stderr)
+        sys.exit(1)
+elif args.non_negative:
+    if number < 0:
+        print("Number should be non-negative", file=sys.stderr)
+        sys.exit(1)