From 5d38a1996cb91ceed060bd70645255474f4d1067 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Wed, 28 Jan 2015 11:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E8=B7=B3=E6=9D=BF=E6=9C=BA=E5=88=B0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84=E5=AF=86=E9=92=A5=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- juser/models.py | 8 ++++---- juser/views.py | 22 +++++++++++----------- static/css/style.css | 2 +- templates/juser/user_add.html | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/juser/models.py b/juser/models.py index 4426a3b17..3c4167db5 100644 --- a/juser/models.py +++ b/juser/models.py @@ -3,8 +3,9 @@ from django.db import models class UserGroup(models.Model): GROUP_TYPE_CHOICES = ( - ('U', 'UniqueUserGroup'), - ('M', 'ManyUserGroup') + ('P', 'PrivateGroup'), + ('M', 'ManageGroup'), + ('A', 'AuthorizeGroup'), ) name = models.CharField(max_length=80, unique=True) @@ -28,8 +29,7 @@ class User(models.Model): role = models.CharField(max_length=2, choices=USER_ROLE_CHOICES, default='CU') user_group = models.ManyToManyField(UserGroup) ldap_pwd = models.CharField(max_length=100) - ssh_key_pwd1 = models.CharField(max_length=100) - ssh_key_pwd2 = models.CharField(max_length=100) + ssh_key_pwd = models.CharField(max_length=100) ssh_pwd = models.CharField(max_length=100) is_active = models.BooleanField(default=True) last_login = models.IntegerField(default=0) diff --git a/juser/views.py b/juser/views.py index 60cbf3f1a..879b31421 100644 --- a/juser/views.py +++ b/juser/views.py @@ -256,7 +256,7 @@ def user_edit(request): user = User.objects.get(id=user_id) username = user.username password = user.password - ssh_key_pwd1 = user.ssh_key_pwd1 + ssh_key_pwd = user.ssh_key_pwd name = user.name all_group = UserGroup.objects.all() groups = user.user_group.filter(type='M') @@ -275,7 +275,7 @@ def user_edit(request): groups_str = ' '.join(groups) role_post = request.POST.get('role', None) ssh_pwd = request.POST.get('ssh_pwd', None) - ssh_key_pwd1 = request.POST.get('ssh_key_pwd1', None) + ssh_key_pwd = request.POST.get('ssh_key_pwd', None) is_active = request.POST.get('is_active', '1') ldap_pwd = gen_rand_pwd(16) all_group = UserGroup.objects.all() @@ -292,8 +292,8 @@ def user_edit(request): if ssh_pwd != user.ssh_pwd: ssh_pwd = CRYPTOR.encrypt(ssh_pwd) - if ssh_key_pwd1 != user.ssh_key_pwd1: - ssh_key_pwd1 = CRYPTOR.encrypt(ssh_key_pwd1) + if ssh_key_pwd != user.ssh_key_pwd: + ssh_key_pwd = CRYPTOR.encrypt(ssh_key_pwd) db_update_user(username=username, password=password, @@ -302,7 +302,7 @@ def user_edit(request): groups=groups, role=role_post, ssh_pwd=ssh_pwd, - ssh_key_pwd1=ssh_key_pwd1) + ssh_key_pwd=ssh_key_pwd) msg = u'修改用户成功' return HttpResponseRedirect('/juser/user_list/') @@ -363,9 +363,9 @@ def gen_ssh_key(username, password=None, length=2048): bash('chown %s:%s %s' % (username, username, public_key_file)) -def server_add_user(username, password, ssh_key_pwd1): +def server_add_user(username, password, ssh_key_pwd): bash('useradd %s; echo %s | passwd --stdin %s' % (username, password, username)) - gen_ssh_key(username, ssh_key_pwd1) + gen_ssh_key(username, ssh_key_pwd) def server_del_user(username): @@ -438,12 +438,12 @@ def user_add(request): groups_str = ' '.join(groups) role_post = request.POST.get('role', None) ssh_pwd = request.POST.get('ssh_pwd', None) - ssh_key_pwd1 = request.POST.get('ssh_key_pwd1', None) + ssh_key_pwd = request.POST.get('ssh_key_pwd', None) is_active = request.POST.get('is_active', '1') ldap_pwd = gen_rand_pwd(16) try: - if None in [username, password, ssh_key_pwd1, name, groups, role_post, is_active]: + if None in [username, password, ssh_key_pwd, name, groups, role_post, is_active]: error = u'带*内容不能为空' raise AddError user = User.objects.filter(username=username) @@ -461,12 +461,12 @@ def user_add(request): name=name, email=email, groups=groups, role=role_post, ssh_pwd=CRYPTOR.encrypt(ssh_pwd), - ssh_key_pwd1=CRYPTOR.encrypt(ssh_key_pwd1), + ssh_key_pwd=CRYPTOR.encrypt(ssh_key_pwd), ldap_pwd=CRYPTOR.encrypt(ldap_pwd), is_active=is_active, date_joined=time_now) - server_add_user(username, password, ssh_key_pwd1) + server_add_user(username, password, ssh_key_pwd) group_db_add(name=username, comment=username, type='U') user_group_add(username=username, group_name=username) if LDAP_ENABLE: diff --git a/static/css/style.css b/static/css/style.css index 28ced9696..b80d0bb47 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -2577,7 +2577,7 @@ a.forum-item-title:hover { padding-right: 20px !important; } body { - font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "open sans", "Helvetica Neue", Helvetica, Arial, "微软雅黑", sans-serif; background-color: #2f4050; font-size: 13px; color: #676a6c; diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html index 1c11825bb..d2c0705c8 100644 --- a/templates/juser/user_add.html +++ b/templates/juser/user_add.html @@ -56,7 +56,7 @@
- + 登陆 Jumpserver 使用的SSH密钥的密码