Add support for a salted SHA2-512 hash

[quassel.git] / src / core / storage.cpp

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index 4a84e9b..f8d60b7 100644 (file)
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -29,7 +29,11 @@ Storage::Storage(QObject *parent)
 
 QString Storage::hashPassword(const QString &password)
 {
+#if QT_VERSION >= 0x050000
+    return hashPasswordSha2_512(password);
+#else
     return hashPasswordSha1(password);
+#endif
 }
 
 bool Storage::checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version)
@@ -41,6 +45,12 @@ bool Storage::checkHashedPassword(const UserId user, const QString &password, co
         passwordCorrect = checkHashedPasswordSha1(password, hashedPassword);
         break;
 
+#if QT_VERSION >= 0x050000
+    case Storage::HashVersion::sha2_512:
+        passwordCorrect = checkHashedPasswordSha2_512(password, hashedPassword);
+        break;
+#endif
+
     default:
         qWarning() << "Password hash version" << QString(version) << "is not supported, please reset password";
     }
@@ -61,3 +71,40 @@ bool Storage::checkHashedPasswordSha1(const QString &password, const QString &ha
 {
     return hashPasswordSha1(password) == hashedPassword;
 }
+
+#if QT_VERSION >= 0x050000
+QString Storage::hashPasswordSha2_512(const QString &password)
+{
+    // Generate a salt of 512 bits (64 bytes) using the Mersenne Twister
+    std::random_device seed;
+    std::mt19937 generator(seed());
+    std::uniform_int_distribution<int> distribution(0, 255);
+    QByteArray saltBytes;
+    saltBytes.resize(64);
+    for (int i = 0; i < 64; i++) {
+        saltBytes[i] = (unsigned char) distribution(generator);
+    }
+    QString salt(saltBytes.toHex());
+
+    // Append the salt to the password and hash it
+    QString passwordAndSalt(password + salt);
+    QString hash(QCryptographicHash::hash(passwordAndSalt.toUtf8(), QCryptographicHash::Sha512).toHex());
+
+    return hash + ":" + salt;
+}
+
+bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword)
+{
+    QRegExp colonSplitter("\\:");
+    QStringList hashedPasswordAndSalt = hashedPassword.split(colonSplitter);
+
+    if (hashedPasswordAndSalt.size() == 2){
+        QString passwordAndSalt(password + hashedPasswordAndSalt[1]);
+        return QString(QCryptographicHash::hash(passwordAndSalt.toUtf8(), QCryptographicHash::Sha512).toHex()) == hashedPasswordAndSalt[0];
+    }
+    else {
+        qWarning() << "Password hash and salt were not in the correct format";
+        return false;
+    }
+}
+#endif