2 files changed, 51 insertions, 1 deletions
diff --git a/src/validators/numeric b/src/validators/numeric
index 58a4fac38..ffe84a234 100755
--- a/src/validators/numeric
+++ b/src/validators/numeric
@@ -25,7 +25,8 @@ 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="")
+group.add_argument("-n", "--non-negative", action="store_true", help="Check if the number is non-negative (>= 0)")
+group.add_argument("-p", "--positive", action="store_true", help="Check if the number is positive (> 0)")
 parser.add_argument("number", type=str, help="Number to validate")
 
 args = parser.parse_args()
@@ -60,3 +61,8 @@ elif args.non_negative:
     if number < 0:
         print("Number should be non-negative", file=sys.stderr)
         sys.exit(1)
+elif args.positive:
+    if number <= 0:
+        print("Number should be positive", file=sys.stderr)
+        sys.exit(1)
+
diff --git a/src/validators/script b/src/validators/script
new file mode 100755
index 000000000..beeba57ae
--- /dev/null
+++ b/src/validators/script
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+#
+# numeric value validator
+#
+# Copyright (C) 2018 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 re
+import os
+import sys
+
+import vyos.util
+
+
+if len(sys.argv) < 2:
+    print("Please specify script file to check")
+    sys.exit(1)
+
+script = sys.argv[1]
+
+if not os.path.exists(script):
+    print("File {0} does not exist".format(script))
+    sys.exit(1)
+
+if not (os.path.isfile(script) and os.access(script, os.X_OK)):
+    print("File {0} is not an executable file".format(script))
+    sys.exit(1)
+
+# File outside the config dir is just a warning
+res, warning = vyos.util.file_is_persistent(script)
+if not res:
+    print(warning)