4 files changed, 77 insertions, 16 deletions
diff --git a/src/validators/fqdn b/src/validators/fqdn
new file mode 100755
index 000000000..9f4ed764f
--- /dev/null
+++ b/src/validators/fqdn
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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 version 2 or later as
+# published by the Free Software Foundation.
+#
+# 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/>.
+
+from re import match
+from sys import argv,exit
+
+if len(argv) == 2:
+  # pattern copied from: https://www.regextester.com/103452
+  pattern = "(?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{0,62}[a-zA-Z0-9]\.)+[a-zA-Z]{2,63}$)"
+  if match(pattern, argv[1]):
+    exit(0)
+  else:
+    exit(1)
+
diff --git a/src/validators/mac-address b/src/validators/mac-address
index d6ec6d712..435920b84 100755
--- a/src/validators/mac-address
+++ b/src/validators/mac-address
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2018-2020 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 version 2 or later as
@@ -13,16 +13,14 @@
 #
 # 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 re
+from sys import exit, argv
 
-if len(sys.argv) == 2:
-  pattern = "^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"
-  if re.match(pattern, sys.argv[1]):
-    sys.exit(0)
-  else:
-    sys.exit(1)
+if len(argv) == 2:
+    pattern = "^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"
+    if re.match(pattern, argv[1]):
+        exit(0)
+    else:
+        exit(1)
 
diff --git a/src/validators/timezone b/src/validators/timezone
index d7a8f64c4..ec845e755 100755
--- a/src/validators/timezone
+++ b/src/validators/timezone
@@ -17,12 +17,8 @@
 import argparse
 
 from sys import exit
-from subprocess import Popen, PIPE, STDOUT
 
-def _cmd(cmd):
-    p = Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True)
-    tmp = p.communicate()[0].strip()
-    return tmp.decode()
+from vyos.util import cmd
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--validate", action="store", help="Check if timezone is valid")
@@ -31,7 +27,7 @@ if __name__ == '__main__':
     args = parser.parse_args()
 
     if args.validate:
-        tz_data = _cmd('find /usr/share/zoneinfo/posix -type f -or -type l | sed -e s:/usr/share/zoneinfo/posix/::')
+        tz_data = cmd('find /usr/share/zoneinfo/posix -type f -or -type l | sed -e s:/usr/share/zoneinfo/posix/::')
         tz_data = tz_data.split('\n')
         # if timezone can't be found in list it's invalid
         if args.validate not in tz_data:
diff --git a/src/validators/vrf-name b/src/validators/vrf-name
new file mode 100755
index 000000000..11c453f4d
--- /dev/null
+++ b/src/validators/vrf-name
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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 version 2 or later as
+# published by the Free Software Foundation.
+#
+# 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
+from sys import exit, argv
+
+if len(argv) == 2:
+    len = len(argv[1])
+    # VRF instance name must be 16 characters or less, python range needs to be
+    # extended by one
+    if not len in range(1, 17):
+        exit(1)
+
+    # Treat loopback interface "lo" explicitly. Adding "lo" explicitly to the
+    # following regex pattern would deny any VRF name starting with lo - thuse
+    # local-vrf would be illegal - and that we do not want.
+    if argv[1] == "lo":
+        exit(1)
+
+    # VRF instances should not be named after regular interface names like bond0,
+    # br10 and so on - this can cause a lot of confusion/trouble
+    pattern = "^(?!(bond|br|dum|eth|lan|eno|ens|enp|enx|gnv|ipoe|l2tp|l2tpeth|" \
+              "vtun|ppp|pppoe|peth|tun|vti|vxlan|wg|wlan|wlm)\d+(\.\d+(v.+)?)?$).*$"
+    if re.match(pattern, argv[1]):
+        exit(0)
+
+exit(1)