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

Fix unsafe argument being passed in

Browse Source 
@dmyerscough passing default argument that are mutable causes issues in python
just fyi :)
This commit is contained in:
Thomas S Hatch 2014-01-03 10:07:40 -07:00
parent 31cd3e6cf4
commit 7c7c9aa58b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/ssh.py
View File

@ -287,7 +287,7 @@ def check_key_file(user,
def check_key(user, key, enc, comment, options, config='.ssh/authorized_keys',
cache_keys=[]):
cache_keys=None):
'''
Check to see if a key needs updating, returns "update", "add" or "exists"
@ -297,6 +297,8 @@ def check_key(user, key, enc, comment, options, config='.ssh/authorized_keys',
salt '*' ssh.check_key <user> <key> <enc> <comment> <options>
'''
if cache_keys is None:
cache_keys = []
enc = _refine_enc(enc)
current = auth_keys(user, config)
nline = _format_auth_line(key, enc, comment, options)
@ -458,7 +460,7 @@ def set_auth_key(
comment='',
options=None,
config='.ssh/authorized_keys',
cache_keys=[]):
cache_keys=None):
'''
Add a key to the authorized_keys file. The "key" parameter must only be the
string of text that is the encoded key. If the key begins with "ssh-rsa"
@ -471,6 +473,8 @@ def set_auth_key(
salt '*' ssh.set_auth_key <user> '<key>' enc='dsa'
'''
if cache_keys is None:
cache_keys = []
if len(key.split()) > 1:
return 'invalid'