Merge branch 'master' of github.com:azhar3339/electrum into azhar3339-master

gui/qt/password_dialog.py

@@ -20,6 +20,7 @@ from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 from electrum.i18n import _
 from util import *
+import re
 
 
 
@@ -31,6 +32,8 @@ def make_password_dialog(self, wallet, msg, new_pass=True):
     self.new_pw.setEchoMode(2)
     self.conf_pw = QLineEdit()
     self.conf_pw.setEchoMode(2)
+    #Password Strength Label
+    self.pw_strength = QLabel("Password Strength:<font color=""red""> Empty </font> ")
     
     vbox = QVBoxLayout()
     label = QLabel(msg)
@@ -62,10 +65,16 @@ def make_password_dialog(self, wallet, msg, new_pass=True):
     grid.addWidget(QLabel(_('New Password') if new_pass else _('Password')), 1, 0)
     grid.addWidget(self.new_pw, 1, 1)
 
+    #add Password Strength Label to grid
+    grid.addWidget(self.pw_strength, 1, 2)
+
     grid.addWidget(QLabel(_('Confirm Password')), 2, 0)
     grid.addWidget(self.conf_pw, 2, 1)
     vbox.addLayout(grid)
 
+    #Add an event handler to update password strength interactively
+    self.connect(self.new_pw, SIGNAL("textChanged(QString)"), lambda: update_password_strength(self.pw_strength,self.new_pw.text()))
+
     vbox.addStretch(1)
     vbox.addLayout(ok_cancel_buttons(self))
     return vbox
@@ -94,6 +103,52 @@ def run_password_dialog(self, wallet, parent):
 
     return True, password, new_password
 
+def check_password_strength(password):
+
+    '''
+    Check the strength of the password entered by the user and return back the same
+    :param password: password entered by user in New Password
+    :return: password strength Weak or Medium or Strong
+    '''
+
+    password_strength = {-1:"Empty",0:"Too short",1:"Weak",2:"Medium",3:"Medium",4:"Strong",5:"Strong"}
+    score = -1
+
+    if len(password) == 0:
+        return password_strength[score]
+    elif len(password) < 6:
+        score = score + 1
+        return password_strength[score]
+    else:
+        score += 1
+
+    if re.search(r'[A-Z]', password):
+        score += 1
+
+    if re.search(r'[a-z]', password):
+        score += 1
+
+    if re.search(r'[0-9]', password):
+        score += 1
+
+    if not re.match("^[a-zA-Z0-9]*$",password):
+        score += 1
+
+    return password_strength[score]
+
+def update_password_strength(pw_strength_label,password):
+
+    '''
+    call the function check_password_strength and update the label pw_strength interactively as the user is typing the password
+    :param pw_strength_label: the label pw_strength
+    :param password: password entered in New Password text box
+    :return: None
+    '''
+    colors = {"Empty":"Red","Too short":"Red","Weak":"Red","Medium":"Blue","Strong":"Green"}
+    strength = check_password_strength(password)
+    pw_strength_label.setText("Password Strength:<font color=" + colors[strength] + ">" + strength + "</font>")
+
+
 
 
 class PasswordDialog(QDialog):