github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

修复sudo 命令　小写all 引起的推送失败(map)

pull/85/head
yumaojun 2016-02-23 23:29:15 +08:00
parent 7bfb1d19fe
commit c6823be302
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jperm/utils.py
View File

@ -68,6 +68,12 @@ def gen_keys(key="", key_path_dir=""):
return key_path_dir
def trans_all(str):
if str.strip().lower() == "all":
return str.upper()
else:
return str
if __name__ == "__main__":
print gen_keys()

20
jperm/views.py
View File

@ -10,7 +10,7 @@ from jasset.models import Asset, AssetGroup
from jperm.models import PermRole, PermRule, PermSudo, PermPush
from jumpserver.models import Setting
from jperm.utils import gen_keys
from jperm.utils import gen_keys, trans_all
from jperm.ansible_api import MyTask
from jperm.perm_api import get_role_info, get_role_push_host
from jumpserver.api import my_render, get_object, CRYPTOR
@ -619,12 +619,9 @@ def perm_sudo_add(request):
raise ServerError(u"sudo name 和 commands是必填项!")
pattern = re.compile(r'[\n,\r]')
deal_commands = list_drop_str(pattern.split(commands), u'')
for command in deal_commands:
if command.strip().lower() == "all":
deal_commands.remove(command)
deal_commands.append(command.upper())
commands = ', '.join(deal_commands)
deal_space_commands = list_drop_str(pattern.split(commands), u'')
deal_all_commands = map(trans_all, deal_space_commands)
commands = ', '.join(deal_all_commands)
logger.debug(u'添加sudo %s: %s' % (name, commands))
if get_object(PermSudo, name=name):
@ -661,12 +658,9 @@ def perm_sudo_edit(request):
raise ServerError(u"sudo name 和 commands是必填项!")
pattern = re.compile(r'[\n,\r]')
deal_commands = list_drop_str(pattern.split(commands), u'')
for command in deal_commands:
if command.strip().lower() == "all":
deal_commands.remove(command)
deal_commands.append(command.upper())
commands = ', '.join(deal_commands).strip()
deal_space_commands = list_drop_str(pattern.split(commands), u'')
deal_all_commands = map(trans_all, deal_space_commands)
commands = ', '.join(deal_all_commands).strip()
logger.debug(u'添加sudo %s: %s' % (name, commands))
sudo.name = name.strip()