Add clean_id function to salt.utils.verify.py

saltstack · Jul 31, 2017 · dc649de · dc649de
1 parent 24c4ae9
commit dc649de
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/salt/utils/verify.py b/salt/utils/verify.py
@@ -485,12 +485,21 @@ def clean_path(root, path, subdir=False):
     return ''
 
 
+def clean_id(id_):
+    '''
+    Returns if the passed id is clean.
+    '''
+    if re.search(r'\.\.{sep}'.format(sep=os.sep), id_):
+        return False
+    return True
+
+
 def valid_id(opts, id_):
     '''
     Returns if the passed id is valid
     '''
     try:
-        return bool(clean_path(opts['pki_dir'], id_))
+        return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_)
     except (AttributeError, KeyError) as e:
         return False