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

Raise error if we don't find exactly one root group.

Browse Source
This commit is contained in:
Felix Geyer 2013-04-20 19:17:09 +02:00
parent f1bebe904a
commit 0ec29b2354
4 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/format/KeePass2XmlReader.cpp
View File

@ -151,21 +151,30 @@ bool KeePass2XmlReader::parseKeePassFile()
{ {
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile"); Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "KeePassFile");
bool rootParsed = false; bool rootElementFound = false;
bool rootParsedSuccesfully = false;
while (!m_xml.error() && m_xml.readNextStartElement()) { while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Meta") { if (m_xml.name() == "Meta") {
parseMeta(); parseMeta();
} }
else if (m_xml.name() == "Root") { else if (m_xml.name() == "Root") {
rootParsed = parseRoot(); rootParsedSuccesfully = parseRoot();
if (rootElementFound) {
rootParsedSuccesfully = false;
raiseError(29);
}
else {
rootElementFound = true;
}
} }
else { else {
skipCurrentElement(); skipCurrentElement();
} }
} }
return rootParsed; return rootParsedSuccesfully;
} }
void KeePass2XmlReader::parseMeta() void KeePass2XmlReader::parseMeta()
@ -423,7 +432,8 @@ bool KeePass2XmlReader::parseRoot()
{ {
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root"); Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Root");
bool groupParsed = false; bool groupElementFound = false;
bool groupParsedSuccesfully = false;
while (!m_xml.error() && m_xml.readNextStartElement()) { while (!m_xml.error() && m_xml.readNextStartElement()) {
if (m_xml.name() == "Group") { if (m_xml.name() == "Group") {
@ -432,7 +442,15 @@ bool KeePass2XmlReader::parseRoot()
Group* oldRoot = m_db->rootGroup(); Group* oldRoot = m_db->rootGroup();
m_db->setRootGroup(rootGroup); m_db->setRootGroup(rootGroup);
delete oldRoot; delete oldRoot;
groupParsed = true; groupParsedSuccesfully = true;
}
if (groupElementFound) {
groupParsedSuccesfully = false;
raiseError(30);
}
else {
groupElementFound = true;
} }
} }
else if (m_xml.name() == "DeletedObjects") { else if (m_xml.name() == "DeletedObjects") {
@ -443,7 +461,7 @@ bool KeePass2XmlReader::parseRoot()
} }
} }
return groupParsed; return groupParsedSuccesfully;
} }
Group* KeePass2XmlReader::parseGroup() Group* KeePass2XmlReader::parseGroup()

2
tests/TestKeePass2XmlReader.cpp
View File

@ -370,6 +370,8 @@ void TestKeePass2XmlReader::testBroken_data()
QTest::newRow("BrokenNoGroupUuid") << "BrokenNoGroupUuid"; QTest::newRow("BrokenNoGroupUuid") << "BrokenNoGroupUuid";
QTest::newRow("BrokenNoEntryUuid") << "BrokenNoEntryUuid"; QTest::newRow("BrokenNoEntryUuid") << "BrokenNoEntryUuid";
QTest::newRow("BrokenNoRootGroup") << "BrokenNoRootGroup"; QTest::newRow("BrokenNoRootGroup") << "BrokenNoRootGroup";
QTest::newRow("BrokenTwoRoots") << "BrokenTwoRoots";
QTest::newRow("BrokenTwoRootGroups") << "BrokenTwoRootGroups";
} }
void TestKeePass2XmlReader::cleanupTestCase() void TestKeePass2XmlReader::cleanupTestCase()

13
tests/data/BrokenTwoRootGroups.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<KeePassFile>
<Root>
<Group>
<UUID>lmU+9n0aeESKZvcEze+bRg==</UUID>
<Name>Test</Name>
</Group>
<Group>
<UUID>AaUYVdXsI02h4T1RiAlgtg==</UUID>
<Name>Test</Name>
</Group>
</Root>
</KeePassFile>

15
tests/data/BrokenTwoRoots.xml Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<KeePassFile>
<Root>
<Group>
<UUID>lmU+9n0aeESKZvcEze+bRg==</UUID>
<Name>Test</Name>
</Group>
</Root>
<Root>
<Group>
<UUID>AaUYVdXsI02h4T1RiAlgtg==</UUID>
<Name>Test</Name>
</Group>
</Root>
</KeePassFile>