Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

FdoSecrets: remove half created entries if the creation fails

Browse Source
This commit is contained in:
Aetf 2019-12-01 21:53:29 -05:00 committed by Jonathan White
parent a518f4306d
commit 1ae7e72aa8
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fdosecrets/objects/Collection.cpp
View File

@ -21,6 +21,7 @@
#include "fdosecrets/objects/Item.h" #include "fdosecrets/objects/Item.h"
#include "fdosecrets/objects/Prompt.h" #include "fdosecrets/objects/Prompt.h"
#include "fdosecrets/objects/Service.h" #include "fdosecrets/objects/Service.h"
#include "fdosecrets/objects/Session.h"
#include "core/Config.h" #include "core/Config.h"
#include "core/Database.h" #include "core/Database.h"
@ -284,8 +285,13 @@ namespace FdoSecrets
return ret; return ret;
} }
if (!pathToObject<Session>(secret.session)) {
return DBusReturn<>::Error(QStringLiteral(DBUS_ERROR_SECRET_NO_SESSION));
}
prompt = nullptr; prompt = nullptr;
bool newlyCreated = true;
Item* item = nullptr; Item* item = nullptr;
QString itemPath; QString itemPath;
StringStringMap attributes; StringStringMap attributes;
@ -303,6 +309,7 @@ namespace FdoSecrets
} }
if (!existings.value().isEmpty() && replace) { if (!existings.value().isEmpty() && replace) {
item = existings.value().front(); item = existings.value().front();
newlyCreated = false;
} }
} }
@ -337,10 +344,16 @@ namespace FdoSecrets
ret = item->setProperties(properties); ret = item->setProperties(properties);
if (ret.isError()) { if (ret.isError()) {
if (newlyCreated) {
item->doDelete();
}
return ret; return ret;
} }
ret = item->setSecret(secret); ret = item->setSecret(secret);
if (ret.isError()) { if (ret.isError()) {
if (newlyCreated) {
item->doDelete();
}
return ret; return ret;
} }