From 9601476077c29fe05953185201ed7c30e91c86ab Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 29 Sep 2014 17:05:03 +0800
Subject: [PATCH] =?UTF-8?q?maybe=E6=9D=9E=EF=B8=BD=EE=82=BC=E6=BF=82?=
 =?UTF-8?q?=E6=88=92=E7=B0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/AutoSa/views.py        | 3 +++
 webroot/AutoSa/UserManage/forms.py    | 2 +-
 webroot/AutoSa/templates/chgUser.html | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 0fcf8bb68..2e772476c 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -509,6 +509,9 @@ def chgUser(request):
         if '' in [username, password, key_pass, name, group_post]:
             error = u'带*内容不能为空'
 
+        if len(password) < 6 or len(key_pass) < 6:
+            error = u'密码长度需>6'
+
         u = User.objects.get(username=username)
 
         chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.key_pass), key_pass, keyfile))
diff --git a/webroot/AutoSa/UserManage/forms.py b/webroot/AutoSa/UserManage/forms.py
index 9232ac884..a41222291 100644
--- a/webroot/AutoSa/UserManage/forms.py
+++ b/webroot/AutoSa/UserManage/forms.py
@@ -18,7 +18,7 @@ class UserAddForm(forms.Form):
     password_again = forms.CharField(max_length=30,
                                      widget=forms.PasswordInput(
                                          attrs={'class': 'form-control', 'placeholder': '确认密码'}))
-    key_pass = forms.CharField(max_length=30,
+    key_pass = forms.CharField(max_length=30, min_length=6,
                                widget=forms.PasswordInput(attrs={'class': 'form-control', 'placeholder': '密钥密码'}))
     key_pass_again = forms.CharField(max_length=30,
                                      widget=forms.PasswordInput(
diff --git a/webroot/AutoSa/templates/chgUser.html b/webroot/AutoSa/templates/chgUser.html
index b4f9bf5ce..922241530 100644
--- a/webroot/AutoSa/templates/chgUser.html
+++ b/webroot/AutoSa/templates/chgUser.html
@@ -39,15 +39,15 @@
                 </div>
             </div>
             <div class="form-group">
-                <label for="keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
+                <label for="key_pass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" id="keypass" name="keypass" class="form-control" value="{{ user.key_pass }}" >
+                    <input type="password" id="key_pass" name="key_pass" class="form-control" value="{{ user.key_pass }}" >
                 </div>
             </div>
             <div class="form-group">
-                <label for="keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
+                <label for="key_pass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" id="keypass_again" name="keypass_again" class="form-control" value="{{ user.key_pass }}" >
+                    <input type="password" id="key_pass_again" name="key_pass_again" class="form-control" value="{{ user.key_pass }}" >
                 </div>
             </div>
             <div class="form-group">