Add a validator for scripts that are supposed to be in /config

2 files changed, 53 insertions, 0 deletions

diff --git a/python/vyos/util.py b/python/vyos/util.py
index 1419e490b..8b5342575 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -13,6 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import re
 import grp
 import psutil
@@ -122,3 +123,11 @@ def seconds_to_human(s, separator=""):
 def get_cfg_group_id():
     group_data = grp.getgrnam(vyos.defaults.cfg_group)
     return group_data.gr_gid
+
+def file_is_persistent(path):
+    if not re.match(r'^(/config|/opt/vyatta/etc/config)', os.path.dirname(path)):
+        warning = "Warning: file {0} is outside the /config directory\n".format(path)
+        warning += "It will not be automatically migrated to a new image on system update"
+        return (False, warning)
+    else:
+        return (True, None)
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)