X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fstorage.cpp;h=4a84e9bb35ea623e2878a23b4f8e1e92b3bac15c;hp=2e81de6773c7cc3f14fbb4a7c681ce9e5e2c22e5;hb=5924533c6d0f9777d38c01ed7e1510a55db2b876;hpb=53211b31038dac1726bb768dce4ae4dda1090cd3

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index 2e81de67..4a84e9bb 100644
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -27,8 +27,37 @@ Storage::Storage(QObject *parent)
 {
 }
 
+QString Storage::hashPassword(const QString &password)
+{
+    return hashPasswordSha1(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;
+
+    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;
+}