Fix FTBFS on certain older libstdc++ versions.

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

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index 38cb100..4b56573 100644 (file)
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,14 +21,95 @@
 #include "storage.h"
 
 #include <QCryptographicHash>
+#include <random>
+
+#if QT_VERSION < 0x050000
+#    include "../../3rdparty/sha512/sha512.h"
+#endif
 
 Storage::Storage(QObject *parent)
     : QObject(parent)
 {
 }
 
+QString Storage::hashPassword(const QString &password)
+{
+    return hashPasswordSha2_512(password);
+}
 
-QString Storage::cryptedPassword(const QString &password)
+bool Storage::checkHashedPassword(const UserId user, const QString &password, const QString &hashedPassword, const Storage::HashVersion version)
+{
+    bool passwordCorrect = false;
+    
+    switch (version) {
+    case Storage::HashVersion::Sha1:
+        passwordCorrect = checkHashedPasswordSha1(password, hashedPassword);
+        break;
+
+    case Storage::HashVersion::Sha2_512:
+        passwordCorrect = checkHashedPasswordSha2_512(password, hashedPassword);
+        break;
+
+    default:
+        qWarning() << "Password hash version" << QString(version) << "is not supported, please reset password";
+    }
+    
+    if (passwordCorrect && version < Storage::HashVersion::Latest) {
+        updateUser(user, password);
+    }
+    
+    return passwordCorrect;
+}
+
+QString Storage::hashPasswordSha1(const QString &password)
 {
     return QString(QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1).toHex());
 }
+
+bool Storage::checkHashedPasswordSha1(const QString &password, const QString &hashedPassword)
+{
+    return hashPasswordSha1(password) == hashedPassword;
+}
+
+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, hash the result, and append the salt value
+    return sha2_512(password + salt) + ":" + salt;
+}
+
+bool Storage::checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword)
+{
+    QRegExp colonSplitter("\\:");
+    QStringList hashedPasswordAndSalt = hashedPassword.split(colonSplitter);
+
+    if (hashedPasswordAndSalt.size() == 2){
+        return sha2_512(password + hashedPasswordAndSalt[1]) == hashedPasswordAndSalt[0];
+    }
+    else {
+        qWarning() << "Password hash and salt were not in the correct format";
+        return false;
+    }
+}
+
+QString Storage::sha2_512(const QString &input)
+{
+#if QT_VERSION >= 0x050000
+    return QString(QCryptographicHash::hash(input.toUtf8(), QCryptographicHash::Sha512).toHex());
+#else
+    QByteArray inputBytes = input.toUtf8();
+    unsigned char output[64];
+    sha512((unsigned char*) inputBytes.constData(), inputBytes.size(), output, false);
+    return QString(QByteArray::fromRawData((char*) output, 64).toHex());
+#endif
+}