Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-30 09:46:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make KeePass2XmlReader::parseEntry() safe against reordered xml elements.

Browse Source
This commit is contained in:
Felix Geyer 2013-04-14 14:31:19 +02:00
parent 61ee763515
commit 3acb33e05a
2 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/format/KeePass2XmlReader.cpp
View File

@ -28,6 +28,8 @@
#include "format/KeePass2RandomStream.h"
#include "streams/QtIOCompressor"
typedef QPair<QString, QString> StringPair;
KeePass2XmlReader::KeePass2XmlReader()
: m_randomStream(Q_NULLPTR)
, m_db(Q_NULLPTR)
@ -553,7 +555,11 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Entry");
Entry* entry = Q_NULLPTR;
Entry* entry = new Entry();
entry->setUpdateTimeinfo(false);
QList<Entry*> historyItems;
QList<StringPair> binaryRefs;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "UUID") {
Uuid uuid = readUuid();
@ -561,14 +567,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
raiseError(6);
}
else {
if (history) {
entry = new Entry();
entry->setUpdateTimeinfo(false);
entry->setUuid(uuid);
}
else {
entry = getEntry(uuid);
}
entry->setUuid(uuid);
}
}
else if (m_xml.name() == "IconID") {
@ -605,7 +604,10 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
parseEntryString(entry);
}
else if (m_xml.name() == "Binary") {
parseEntryBinary(entry);
QPair<QString, QString> ref = parseEntryBinary(entry);
if (!ref.first.isNull() && !ref.second.isNull()) {
binaryRefs.append(ref);
}
}
else if (m_xml.name() == "AutoType") {
parseAutoType(entry);
@ -615,7 +617,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
raiseError(8);
}
else {
parseEntryHistory(entry);
historyItems = parseEntryHistory();
}
}
else {
@ -623,6 +625,27 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
}
}
if (history) {
entry->setUpdateTimeinfo(false);
}
else {
Entry* tmpEntry = entry;
entry = getEntry(tmpEntry->uuid());
entry->copyDataFrom(tmpEntry);
entry->setUpdateTimeinfo(false);
delete tmpEntry;
}
Q_FOREACH (Entry* historyItem, historyItems) {
entry->addHistoryItem(historyItem);
}
Q_FOREACH (const StringPair& ref, binaryRefs) {
m_binaryMap.insertMulti(ref.first, qMakePair(entry, ref.second));
}
return entry;
}
@ -659,10 +682,12 @@ void KeePass2XmlReader::parseEntryString(Entry* entry)
}
}
void KeePass2XmlReader::parseEntryBinary(Entry* entry)
QPair<QString, QString> KeePass2XmlReader::parseEntryBinary(Entry* entry)
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binary");
QPair<QString, QString> poolRef;
QString key;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Key") {
@ -672,7 +697,7 @@ void KeePass2XmlReader::parseEntryBinary(Entry* entry)
QXmlStreamAttributes attr = m_xml.attributes();
if (attr.hasAttribute("Ref")) {
m_binaryMap.insertMulti(attr.value("Ref").toString(), qMakePair(entry, key));
poolRef = qMakePair(attr.value("Ref").toString(), key);
m_xml.skipCurrentElement();
}
else {
@ -692,6 +717,8 @@ void KeePass2XmlReader::parseEntryBinary(Entry* entry)
skipCurrentElement();
}
}
return poolRef;
}
void KeePass2XmlReader::parseAutoType(Entry* entry)
@ -736,19 +763,22 @@ void KeePass2XmlReader::parseAutoTypeAssoc(Entry* entry)
}
}
void KeePass2XmlReader::parseEntryHistory(Entry* entry)
QList<Entry*> KeePass2XmlReader::parseEntryHistory()
{
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "History");
QList<Entry*> historyItems;
while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Entry") {
Entry* historyItem = parseEntry(true);
entry->addHistoryItem(historyItem);
historyItems.append(parseEntry(true));
}
else {
skipCurrentElement();
}
}
return historyItems;
}
TimeInfo KeePass2XmlReader::parseTimes()

4
src/format/KeePass2XmlReader.h
View File

@ -63,10 +63,10 @@ private:
void parseDeletedObject();
Entry* parseEntry(bool history);
void parseEntryString(Entry* entry);
void parseEntryBinary(Entry* entry);
QPair<QString, QString> parseEntryBinary(Entry* entry);
void parseAutoType(Entry* entry);
void parseAutoTypeAssoc(Entry* entry);
void parseEntryHistory(Entry* entry);
QList<Entry*> parseEntryHistory();
TimeInfo parseTimes();
QString readString();