Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-22 15:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve KDBX error messages

Browse Source
This commit is contained in:
Jonathan White 2020-10-07 11:51:47 -04:00 committed by Janek Bevendorff
parent 17aefc3cf7
commit 1ca358f3fd
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/format/Kdbx3Reader.cpp
View File

@ -43,7 +43,7 @@ bool Kdbx3Reader::readDatabaseImpl(QIODevice* device,
// check if all required headers were present // check if all required headers were present
if (m_masterSeed.isEmpty() || m_encryptionIV.isEmpty() || m_streamStartBytes.isEmpty() if (m_masterSeed.isEmpty() || m_encryptionIV.isEmpty() || m_streamStartBytes.isEmpty()
|| m_protectedStreamKey.isEmpty() || db->cipher().isNull()) { || m_protectedStreamKey.isEmpty() || db->cipher().isNull()) {
raiseError(tr("missing database headers")); raiseError(tr("Missing database headers"));
return false; return false;
} }
@ -147,7 +147,7 @@ bool Kdbx3Reader::readHeaderField(StoreDataStream& headerStream, Database* db)
bool ok; bool ok;
auto fieldLen = Endian::readSizedInt<quint16>(&headerStream, KeePass2::BYTEORDER, &ok); auto fieldLen = Endian::readSizedInt<quint16>(&headerStream, KeePass2::BYTEORDER, &ok);
if (!ok) { if (!ok) {
raiseError(tr("Invalid header field length")); raiseError(tr("Invalid header field length: field %1").arg(fieldID));
return false; return false;
} }
@ -155,7 +155,10 @@ bool Kdbx3Reader::readHeaderField(StoreDataStream& headerStream, Database* db)
if (fieldLen != 0) { if (fieldLen != 0) {
fieldData = headerStream.read(fieldLen); fieldData = headerStream.read(fieldLen);
if (fieldData.size() != fieldLen) { if (fieldData.size() != fieldLen) {
raiseError(tr("Invalid header data length")); raiseError(tr("Invalid header data length: field %1, %2 expected, %3 found")
.arg(fieldID)
.arg(fieldLen)
.arg(fieldData.size()));
return false; return false;
} }
} }

14
src/format/Kdbx4Reader.cpp
View File

@ -166,7 +166,7 @@ bool Kdbx4Reader::readHeaderField(StoreDataStream& device, Database* db)
bool ok; bool ok;
auto fieldLen = Endian::readSizedInt<quint32>(&device, KeePass2::BYTEORDER, &ok); auto fieldLen = Endian::readSizedInt<quint32>(&device, KeePass2::BYTEORDER, &ok);
if (!ok) { if (!ok) {
raiseError(tr("Invalid header field length")); raiseError(tr("Invalid header field length: field %1").arg(fieldID));
return false; return false;
} }
@ -174,7 +174,10 @@ bool Kdbx4Reader::readHeaderField(StoreDataStream& device, Database* db)
if (fieldLen != 0) { if (fieldLen != 0) {
fieldData = device.read(fieldLen); fieldData = device.read(fieldLen);
if (static_cast<quint32>(fieldData.size()) != fieldLen) { if (static_cast<quint32>(fieldData.size()) != fieldLen) {
raiseError(tr("Invalid header data length")); raiseError(tr("Invalid header data length: field %1, %2 expected, %3 found")
.arg(static_cast<int>(fieldID))
.arg(fieldLen)
.arg(fieldData.size()));
return false; return false;
} }
} }
@ -258,7 +261,7 @@ bool Kdbx4Reader::readInnerHeaderField(QIODevice* device)
bool ok; bool ok;
auto fieldLen = Endian::readSizedInt<quint32>(device, KeePass2::BYTEORDER, &ok); auto fieldLen = Endian::readSizedInt<quint32>(device, KeePass2::BYTEORDER, &ok);
if (!ok) { if (!ok) {
raiseError(tr("Invalid inner header field length")); raiseError(tr("Invalid inner header field length: field %1").arg(static_cast<int>(fieldID)));
return false; return false;
} }
@ -266,7 +269,10 @@ bool Kdbx4Reader::readInnerHeaderField(QIODevice* device)
if (fieldLen != 0) { if (fieldLen != 0) {
fieldData = device->read(fieldLen); fieldData = device->read(fieldLen);
if (static_cast<quint32>(fieldData.size()) != fieldLen) { if (static_cast<quint32>(fieldData.size()) != fieldLen) {
raiseError(tr("Invalid header data length")); raiseError(tr("Invalid inner header data length: field %1, %2 expected, %3 found")
.arg(static_cast<int>(fieldID))
.arg(fieldLen)
.arg(fieldData.size()));
return false; return false;
} }
} }