diff options
| -rw-r--r-- | changes/bug-5819_default-esc-to-no | 1 | ||||
| -rw-r--r-- | changes/use-same-user-and-pass-restrictions-as-in-the-webapp | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/platform_init/initializers.py | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/util/credentials.py | 4 |
4 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug-5819_default-esc-to-no b/changes/bug-5819_default-esc-to-no new file mode 100644 index 00000000..4dc1f6a2 --- /dev/null +++ b/changes/bug-5819_default-esc-to-no @@ -0,0 +1 @@ +- Pressing ESC on 'install helper files' defaults to No. Closes #5819. diff --git a/changes/use-same-user-and-pass-restrictions-as-in-the-webapp b/changes/use-same-user-and-pass-restrictions-as-in-the-webapp new file mode 100644 index 00000000..88d97f00 --- /dev/null +++ b/changes/use-same-user-and-pass-restrictions-as-in-the-webapp @@ -0,0 +1 @@ +Use same user/password restrictions as in the webapp. Closes #5894. diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index e4d6f9b3..f56b9330 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -106,6 +106,7 @@ def get_missing_helpers_dialog(): msg.setStandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) msg.addButton("No, don't ask again", QtGui.QMessageBox.RejectRole) msg.setDefaultButton(QtGui.QMessageBox.Yes) + msg.setEscapeButton(QtGui.QMessageBox.No) return msg diff --git a/src/leap/bitmask/util/credentials.py b/src/leap/bitmask/util/credentials.py index 07ded17b..757ce10c 100644 --- a/src/leap/bitmask/util/credentials.py +++ b/src/leap/bitmask/util/credentials.py @@ -21,7 +21,7 @@ Credentials utilities from PySide import QtCore, QtGui WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", "password") -USERNAME_REGEX = r"^[A-Za-z][A-Za-z\d_\-\.]+[A-Za-z\d]$" +USERNAME_REGEX = r"^[a-z][a-z\d_\-\.]+[a-z\d]$" USERNAME_VALIDATOR = QtGui.QRegExpValidator(QtCore.QRegExp(USERNAME_REGEX)) @@ -69,7 +69,7 @@ def password_checks(username, password, password2): if message is None and not password: message = _tr("You can't use an empty password") - if message is None and len(password) < 6: + if message is None and len(password) < 8: message = _tr("Password too short") if message is None and password in WEAK_PASSWORDS: |