github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-18 17:01:31 +00:00
Code Issues Projects Releases Wiki Activity

bug越来越多

Browse Source
This commit is contained in:
guanghongwei 2014-09-29 16:22:30 +08:00
parent 632b863cf7
commit 42d130d5c2
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webroot/AutoSa/AutoSa/views.py
View File

@ -439,9 +439,8 @@ def addUser(request):
'userPassword': ['{crypt}x'], 'userPassword': ['{crypt}x'],
'gidNumber': [str(u.id)] 'gidNumber': [str(u.id)]
} }
try:
ldap_conn = LDAPMgmt() ldap_conn = LDAPMgmt()
try:
ldap_conn.add(user_dn, user_attr) ldap_conn.add(user_dn, user_attr)
ldap_conn.add(group_dn, group_attr) ldap_conn.add(group_dn, group_attr)
except Exception, e: except Exception, e:
@ -490,7 +489,6 @@ def chgUser(request):
name = request.POST.get('name') name = request.POST.get('name')
is_admin = request.POST.get('is_admin') is_admin = request.POST.get('is_admin')
is_superuser = request.POST.get('is_superuser') is_superuser = request.POST.get('is_superuser')
ldap_password = jm.encrypt(keygen(16))
group_post = request.REQUEST.getlist('group') group_post = request.REQUEST.getlist('group')
user = User.objects.get(username=username) user = User.objects.get(username=username)
@ -506,17 +504,17 @@ def chgUser(request):
is_superuser = False is_superuser = False
if password != password_again or key_pass != key_pass_again: if password != password_again or key_pass != key_pass_again:
error = '密码不匹配' error = u'密码不匹配'
if '' in [username, password, key_pass, name, group_post]: if '' in [username, password, key_pass, name, group_post]:
error = '带*内容不能为空' error = u'带*内容不能为空'
u = User.objects.get(username=username) u = User.objects.get(username=username)
chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.password), password, keyfile)) chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.key_pass), key_pass, keyfile))
if chg_keypass != 0: if chg_keypass != 0:
error = '修改密钥密码失败' error = u'修改密钥密码失败'
if error: if error:
return render_to_response('chgUser.html', return render_to_response('chgUser.html',
@ -529,7 +527,6 @@ def chgUser(request):
u.name = name u.name = name
u.is_admin = is_admin u.is_admin = is_admin
u.is_superuser = is_superuser u.is_superuser = is_superuser
u.ldap_password = ldap_password
u.group = groups u.group = groups
u.save() u.save()