mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 05:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move createRandomPassword to public static Q_INVOKABLE method of ShareModel

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-08-11 11:04:25 +08:00
parent e83c2c86e6
commit bfa7fc5299
2 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
src/gui/filedetails/sharemodel.cpp
View file

@ -31,69 +31,6 @@ namespace {
static const auto placeholderLinkShareId = QStringLiteral("__placeholderLinkShareId__");
static const auto internalLinkShareId = QStringLiteral("__internalLinkShareId__");
static const auto secureFileDropPlaceholderLinkShareId = QStringLiteral("__secureFileDropPlaceholderLinkShareId__");
constexpr auto asciiMin = 33;
constexpr auto asciiMax = 126;
constexpr auto asciiRange = asciiMax - asciiMin;
QString createRandomPassword()
{
static constexpr auto numChars = 24;
static constexpr std::string_view lowercaseAlphabet = "abcdefghijklmnopqrstuvwxyz";
static constexpr std::string_view uppercaseAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
static constexpr std::string_view numbers = "0123456789";
static constexpr std::string_view specialChars = R"(ªº\\/|"'*+-_´¨{}·#$%&()=\[\]<>;:@~)";
static const QRegularExpression lowercaseMatch("[a-z]");
static const QRegularExpression uppercaseMatch("[A-Z]");
static const QRegularExpression numberMatch("[0-9]");
static const QRegularExpression specialCharMatch(QString("[%1]").arg(specialChars.data()));
static const std::map<std::string_view, QRegularExpression> matchMap {
{ lowercaseAlphabet, lowercaseMatch },
{ uppercaseAlphabet, uppercaseMatch },
{ numbers, numberMatch },
{ specialChars, specialCharMatch },
};
std::random_device rand_dev;
std::mt19937 rng(rand_dev());
QString passwd;
std::array<unsigned char, numChars> unsignedCharArray;
RAND_bytes(unsignedCharArray.data(), numChars);
for (const auto newChar : unsignedCharArray) {
// Ensure byte is within asciiRange
const auto byte = (newChar % (asciiRange + 1)) + asciiMin;
passwd.append(byte);
}
for (const auto &charsWithMatcher : matchMap) {
const auto selectionChars = charsWithMatcher.first;
const auto matcher = charsWithMatcher.second;
Q_ASSERT(matcher.isValid());
if (matcher.match(passwd).hasMatch()) {
continue;
}
// add random required character at random position
std::uniform_int_distribution<std::mt19937::result_type> passwdDist(0, passwd.length() - 1);
std::uniform_int_distribution<std::mt19937::result_type> charsDist(0, selectionChars.length() - 1);
const auto passwdInsertIndex = passwdDist(rng);
const auto charToInsertIndex = charsDist(rng);
const auto charToInsert = selectionChars.at(charToInsertIndex);
passwd.insert(passwdInsertIndex, charToInsert);
}
return passwd;
}
}
namespace OCC
@ -956,7 +893,7 @@ void ShareModel::toggleSharePasswordProtect(const SharePtr &share, const bool en
return;
}
const auto randomPassword = createRandomPassword();
const auto randomPassword = generatePassword();
_shareIdRecentlySetPasswords.insert(share->getId(), randomPassword);
share->setPassword(randomPassword);
}
@ -1128,7 +1065,7 @@ void ShareModel::createNewLinkShare() const
if (_manager) {
const auto askOptionalPassword = _accountState->account()->capabilities().sharePublicLinkAskOptionalPassword();
const auto password = askOptionalPassword ? createRandomPassword() : QString();
const auto password = askOptionalPassword ? generatePassword() : QString();
if (isSecureFileDropSupportedFolder()) {
_manager->createSecureFileDropShare(_sharePath, {}, password);
return;
@ -1326,4 +1263,65 @@ QVariantList ShareModel::sharees() const
return returnSharees;
}
QString ShareModel::generatePassword()
{
constexpr auto asciiMin = 33;
constexpr auto asciiMax = 126;
constexpr auto asciiRange = asciiMax - asciiMin;
static constexpr auto numChars = 24;
static constexpr std::string_view lowercaseAlphabet = "abcdefghijklmnopqrstuvwxyz";
static constexpr std::string_view uppercaseAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
static constexpr std::string_view numbers = "0123456789";
static constexpr std::string_view specialChars = R"(ªº\\/|"'*+-_´¨{}·#$%&()=\[\]<>;:@~)";
static const QRegularExpression lowercaseMatch("[a-z]");
static const QRegularExpression uppercaseMatch("[A-Z]");
static const QRegularExpression numberMatch("[0-9]");
static const QRegularExpression specialCharMatch(QString("[%1]").arg(specialChars.data()));
static const std::map<std::string_view, QRegularExpression> matchMap{
{lowercaseAlphabet, lowercaseMatch},
{uppercaseAlphabet, uppercaseMatch},
{numbers, numberMatch},
{specialChars, specialCharMatch},
};
std::random_device rand_dev;
std::mt19937 rng(rand_dev());
QString passwd;
std::array<unsigned char, numChars> unsignedCharArray;
RAND_bytes(unsignedCharArray.data(), numChars);
for (const auto newChar : unsignedCharArray) {
// Ensure byte is within asciiRange
const auto byte = (newChar % (asciiRange + 1)) + asciiMin;
passwd.append(byte);
}
for (const auto &charsWithMatcher : matchMap) {
const auto selectionChars = charsWithMatcher.first;
const auto matcher = charsWithMatcher.second;
Q_ASSERT(matcher.isValid());
if (matcher.match(passwd).hasMatch()) {
continue;
}
// add random required character at random position
std::uniform_int_distribution<std::mt19937::result_type> passwdDist(0, passwd.length() - 1);
std::uniform_int_distribution<std::mt19937::result_type> charsDist(0, selectionChars.length() - 1);
const auto passwdInsertIndex = passwdDist(rng);
const auto charToInsertIndex = charsDist(rng);
const auto charToInsert = selectionChars.at(charToInsertIndex);
passwd.insert(passwdInsertIndex, charToInsert);
}
return passwd;
}
} // namespace OCC

2
src/gui/filedetails/sharemodel.h
View file

@ -124,6 +124,8 @@ public:
[[nodiscard]] QVariantList sharees() const;
[[nodiscard]] Q_INVOKABLE static QString generatePassword();
signals:
void localPathChanged();
void accountStateChanged();