valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No reason for a regex, the intent is to stop publish events calling publish. The regex we had (publish.*) actually checks if publish is in the string, we care if it starts with publish.

Browse Source
This commit is contained in:
Thomas Jackson 2014-04-26 14:37:43 -07:00
parent 494f2e3bb4
commit fd440adc1a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/master.py
View File

@ -769,7 +769,7 @@ class AESFuncs(object):
if any(key not in clear_load for key in ('fun', 'arg', 'tgt', 'ret', 'tok', 'id')): if any(key not in clear_load for key in ('fun', 'arg', 'tgt', 'ret', 'tok', 'id')):
return False return False
# If the command will make a recursive publish don't run # If the command will make a recursive publish don't run
if re.match('publish.*', clear_load['fun']): if clear_load['fun'].startswith('publish.'):
return False return False
# Check the permissions for this minion # Check the permissions for this minion
if not self.__verify_minion(clear_load['id'], clear_load['tok']): if not self.__verify_minion(clear_load['id'], clear_load['tok']):