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

diff --git a/src/core/storage.cpp b/src/core/storage.cpp
index d82d0a94..4a84e9bb 100644
--- a/src/core/storage.cpp
+++ b/src/core/storage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,49 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "storage.h"
+
+#include <QCryptographicHash>
+
+Storage::Storage(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString Storage::hashPassword(const QString &password)
+{
+    return hashPasswordSha1(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;
+}