From fa70780b43d51ad72def86ee3f99a9296aa117c4 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 6 Aug 2018 23:10:05 +0200 Subject: [PATCH] add @ as allowed char --- libnymea-core/usermanager.cpp | 2 +- tests/auto/usermanager/testusermanager.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libnymea-core/usermanager.cpp b/libnymea-core/usermanager.cpp index 1ef832e2..c7af9339 100644 --- a/libnymea-core/usermanager.cpp +++ b/libnymea-core/usermanager.cpp @@ -421,7 +421,7 @@ bool UserManager::validatePassword(const QString &password) const if (!password.contains(QRegExp("[0-9]"))) { return false; } - if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\]"))) { + if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\@]"))) { return false; } return true; diff --git a/tests/auto/usermanager/testusermanager.cpp b/tests/auto/usermanager/testusermanager.cpp index b4234d5e..d9f9b150 100644 --- a/tests/auto/usermanager/testusermanager.cpp +++ b/tests/auto/usermanager/testusermanager.cpp @@ -74,6 +74,7 @@ void TestUsermanager::createUser_data() { QTest::newRow("foo@bar.baz, #1-Nymea-is-awesome, NoError") << "foo@bar.baz" << "#1-Nymea-is-awesome" << UserManager::UserErrorNoError; QTest::newRow("foo@bar.baz, Bla1234.a, NoError") << "foo@bar.baz" << "Bla1234.a" << UserManager::UserErrorNoError; QTest::newRow("foo@bar.baz, Bla1234\\a, NoError") << "foo@bar.baz" << "Bla1234\\a" << UserManager::UserErrorNoError; + QTest::newRow("foo@bar.baz, Bla1234@a, NoError") << "foo@bar.baz" << "Bla1234@a" << UserManager::UserErrorNoError; }