From 7b99783603dc8129ba0799a98910ea84542f4201 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 22 Nov 2019 17:37:37 +0100 Subject: [PATCH 1/2] Weaken password requirements a bit We've decided to not require special characters any more --- libnymea-core/usermanager/usermanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libnymea-core/usermanager/usermanager.cpp b/libnymea-core/usermanager/usermanager.cpp index d593ef8e..732ec8ef 100644 --- a/libnymea-core/usermanager/usermanager.cpp +++ b/libnymea-core/usermanager/usermanager.cpp @@ -421,10 +421,10 @@ bool UserManager::validatePassword(const QString &password) const if (!password.contains(QRegExp("[a-z]"))) { return false; } - if (!password.contains(QRegExp("[0-9]"))) { + if (!password.contains(QRegExp("[A-Z]"))) { return false; } - if (!password.contains(QRegExp("[!\"§$%&/()#*\\'+\\.\\\\@€µ~]"))) { + if (!password.contains(QRegExp("[0-9]"))) { return false; } return true; From 1f0e00cb9d65a7b04ed3f13a014aa7fea1919c4b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 25 Nov 2019 12:33:57 +0100 Subject: [PATCH 2/2] Update tests --- tests/auto/usermanager/testusermanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/auto/usermanager/testusermanager.cpp b/tests/auto/usermanager/testusermanager.cpp index d9f9b150..e4c01f2e 100644 --- a/tests/auto/usermanager/testusermanager.cpp +++ b/tests/auto/usermanager/testusermanager.cpp @@ -66,10 +66,9 @@ void TestUsermanager::createUser_data() { QTest::newRow("foo@bar.baz, aaaaaaa!, BadPassword") << "foo@bar.baz" << "aaaaaaa!" << UserManager::UserErrorBadPassword; QTest::newRow("foo@bar.baz, aaaaaaaA, BadPassword") << "foo@bar.baz" << "aaaaaaaA" << UserManager::UserErrorBadPassword; QTest::newRow("foo@bar.baz, aaaaaa!A, BadPassword") << "foo@bar.baz" << "aaaaaa!A" << UserManager::UserErrorBadPassword; + QTest::newRow("foo@bar.baz, aaaaaa!1, BadPassword") << "foo@bar.baz" << "aaaaaa!1" << UserManager::UserErrorBadPassword; - QTest::newRow("foo@bar.baz, aaaaa!1A, BadPassword") << "foo@bar.baz" << "aaaaa!1A" << UserManager::UserErrorNoError; - QTest::newRow("foo@bar.baz, aaaaaa!1, BadPassword") << "foo@bar.baz" << "aaaaaa!1" << UserManager::UserErrorNoError; - + QTest::newRow("foo@bar.baz, aaaaa!1A, NoError") << "foo@bar.baz" << "aaaaa!1A" << UserManager::UserErrorNoError; QTest::newRow("foo@bar.baz, Bla1234*a, NoError") << "foo@bar.baz" << "Bla1234*a" << UserManager::UserErrorNoError; 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;