Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -r7189d77fab4c43a6ca952105c9f44deba6a96a6a -r5687815256ae070a9a207107088e3f72dd464da0 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 7189d77fab4c43a6ca952105c9f44deba6a96a6a) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 5687815256ae070a9a207107088e3f72dd464da0) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VSettings.cpp * \author (last) Behrouz NematiPour - * \date (last) 18-Jul-2023 + * \date (last) 10-Jul-2024 * \author (original) Behrouz NematiPour * \date (original) 29-Mar-2021 * @@ -260,10 +260,11 @@ QString regUpper = "A-Z" ; QString regLower = "a-z" ; QString regDigit = "0-9" ; - QString regSymbl = "!@#$%^&*,.-_"; + QString regSymbl = "!\"#$%&'()*+,\\-./:;<=>?@[\\\\\\]^_`{\\|}~"; QString rln = "[%1]{%2,}" ; - // "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@$!%*?&])[A-Za-z0-9@$!%*?&]{10,}$" + // "^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{\|}~])[A-Za-z0-9!"#$%&'()*+,\-./:;<=>?@[\\\]^_`{\|}~]{10,}$" + // !"#$%&'()*+,\\-./:;<=>?@[\\\\\\]^_`{\\|}~ QString regStr = regSntnc.arg( pla.arg(regUpper) + pla.arg(regLower) + @@ -277,6 +278,9 @@ ); QRegularExpression passwordRegex(regStr); bool ok; + + //DEBUG: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ + //DEBUG: vPassword = "Ab0!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" ok = passwordRegex.match(vPassword).hasMatch(); return ok; } @@ -305,7 +309,7 @@ LOG_DEBUG("Valid Service Password Entered!"); } else { - LOG_DEBUG("Inalid Service Password Entered!"); + LOG_DEBUG("Invalid Service Password Entered!"); } return isValid; }