Fixes (#5) (#6)

* fixed the change password and added function to check password
EddyTheCo · Feb 5, 2024 · cb242f9 · cb242f9
1 parent f73c420
commit cb242f9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/include/vault.hpp b/include/vault.hpp
@@ -45,8 +45,10 @@ class QVAULT_EXPORT Vault: public QObject
           );
     Q_INVOKABLE QString getDataString(QString password)const;
     QByteArray getData(QByteArray password) const;
+    void setFile(QString file){if(file!=m_file){m_file=file;restart();emit fileChanged();}}
     Q_INVOKABLE bool setDataString(QString plainText,QString password);
     Q_INVOKABLE bool changePassword(QString oldPass,QString newPass);
+    Q_INVOKABLE bool checkPassword(QString password)const;
     bool setData(QByteArray plainText,QByteArray password);
     bool isEmpty()const{return m_isEmpty;}
 

diff --git a/src/vault.cpp b/src/vault.cpp
@@ -34,7 +34,6 @@ Vault::Vault(QObject *parent,const QString filename):QObject(parent),m_ctx(EVP_C
     m_isEmpty(true)
 {
     readFromFile();
-    connect(this,&Vault::fileChanged,this,&Vault::restart);
     connect(this,&QObject::destroyed,this,[=](){EVP_CIPHER_CTX_free(m_ctx);});
 }
 void Vault::restart()
@@ -43,8 +42,26 @@ void Vault::restart()
     setIsEmpty(true);
     readFromFile();
 }
+bool Vault::checkPassword(QString password)const
+{
+    if(m_isEmpty||password.size()<8) return false;
+
+    auto passHash=QPasswordDigestor::deriveKeyPbkdf2(
+        QCryptographicHash::Sha512,
+        password.toUtf8(),
+        m_iv,
+        NITERATIONS,
+        64);
+    if(passHash==m_passHash)
+    {
+        return true;
+    }
+    return false;
+
+}
 bool Vault::changePassword(QString oldPass,QString newPass)
 {
+
     if(m_isEmpty||newPass.size()<8||oldPass.size()<8) return false;
 
     auto oldPassHash=QPasswordDigestor::deriveKeyPbkdf2(
@@ -62,6 +79,7 @@ bool Vault::changePassword(QString oldPass,QString newPass)
             m_iv,
             NITERATIONS,
             32);
+
         const auto plainText=getContent(oldkey);
         setRandomIV();
         auto newPassHash=QPasswordDigestor::deriveKeyPbkdf2(
@@ -70,14 +88,17 @@ bool Vault::changePassword(QString oldPass,QString newPass)
             m_iv,
             NITERATIONS,
             64);
+
         auto newkey=QPasswordDigestor::deriveKeyPbkdf2(
             QCryptographicHash::Sha256,
             newPass.toUtf8(),
             m_iv,
             NITERATIONS,
             32);
-        setContent(plainText,newkey);
+
         m_passHash=newPassHash;
+        setContent(plainText,newkey);
+
         return true;
     }
     return false;
@@ -151,6 +172,7 @@ if(file.exists()&&file.open(QIODevice::ReadOnly))
 }
 void Vault::setRandomIV()
 {
+    m_iv=QByteArray();
     auto buffer=QDataStream(&m_iv,QIODevice::WriteOnly | QIODevice::Append);
     for(auto i=0;i<4;i++)
     {
@@ -239,6 +261,7 @@ bool Vault::setData(QByteArray plainText,QByteArray password)
             m_iv,
             NITERATIONS,
             32);
+
         return setContent(plainText,key);
     }
     return false;