summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/use-same-user-and-pass-restrictions-as-in-the-webapp1
-rw-r--r--src/leap/bitmask/util/credentials.py4
2 files changed, 3 insertions, 2 deletions
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/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: