Merge pull request #1072 from frostasm/add-support-for-placeholders-on-keepasshttp-custom-fields

Add support for placeholders on the KeePassHTTP custom fields (#1067)
This commit is contained in:
TheZ3ro 2017-10-26 16:22:38 +02:00 committed by GitHub
commit 5718f3dca2

View File

@ -259,13 +259,16 @@ Service::Access Service::checkAccess(const Entry *entry, const QString & host, c
KeepassHttpProtocol::Entry Service::prepareEntry(const Entry* entry) KeepassHttpProtocol::Entry Service::prepareEntry(const Entry* entry)
{ {
KeepassHttpProtocol::Entry res(entry->resolvePlaceholder(entry->title()), entry->resolvePlaceholder(entry->username()), entry->resolvePlaceholder(entry->password()), entry->uuid().toHex()); KeepassHttpProtocol::Entry res(entry->resolveMultiplePlaceholders(entry->title()),
entry->resolveMultiplePlaceholders(entry->username()),
entry->resolveMultiplePlaceholders(entry->password()),
entry->uuid().toHex());
if (HttpSettings::supportKphFields()) { if (HttpSettings::supportKphFields()) {
const EntryAttributes * attr = entry->attributes(); const EntryAttributes * attr = entry->attributes();
const auto keys = attr->keys(); const auto keys = attr->keys();
for (const QString& key: keys) { for (const QString& key: keys) {
if (key.startsWith(QLatin1String("KPH: "))) { if (key.startsWith(QLatin1String("KPH: "))) {
res.addStringField(key, attr->value(key)); res.addStringField(key, entry->resolveMultiplePlaceholders(attr->value(key)));
} }
} }
} }