mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add Autotype Entry-Attributes, Fix Group default sequence (#107)

Browse source
This commit is contained in:
TheZ3ro 2016-11-25 18:26:59 +01:00 • committed by Jonathan White
parent 0dfd2003f9
commit 405b82588b
7 changed files with 114 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/autotype/AutoType.cpp
View file

@ -356,18 +356,18 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, const Entry* entry) QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, const Entry* entry)
{ {
QString tmplName = tmpl.toLower(); QString tmplName = tmpl;
int num = -1; int num = -1;
QList<AutoTypeAction*> list; QList<AutoTypeAction*> list;
QRegExp delayRegEx("delay=(\\d+)", Qt::CaseSensitive, QRegExp::RegExp2); QRegExp delayRegEx("delay=(\\d+)", Qt::CaseInsensitive, QRegExp::RegExp2);
if (delayRegEx.exactMatch(tmplName)) { if (delayRegEx.exactMatch(tmplName)) {
num = delayRegEx.cap(1).toInt(); num = delayRegEx.cap(1).toInt();
m_autoTypeDelay = std::max(0, std::min(num, 10000)); m_autoTypeDelay = std::max(0, std::min(num, 10000));
return list; return list;
} }
QRegExp repeatRegEx("(.+) (\\d+)", Qt::CaseSensitive, QRegExp::RegExp2); QRegExp repeatRegEx("(.+) (\\d+)", Qt::CaseInsensitive, QRegExp::RegExp2);
if (repeatRegEx.exactMatch(tmplName)) { if (repeatRegEx.exactMatch(tmplName)) {
tmplName = repeatRegEx.cap(1); tmplName = repeatRegEx.cap(1);
num = repeatRegEx.cap(2).toInt(); num = repeatRegEx.cap(2).toInt();
@ -376,7 +376,7 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
return list; return list;
} }
// some safety checks // some safety checks
else if (tmplName == "delay") { else if (tmplName.compare("delay",Qt::CaseInsensitive)==0) {
if (num > 10000) { if (num > 10000) {
return list; return list;
} }
@ -386,98 +386,103 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
} }
} }
if (tmplName == "tab") { if (tmplName.compare("tab",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Tab)); list.append(new AutoTypeKey(Qt::Key_Tab));
} }
else if (tmplName == "enter") { else if (tmplName.compare("enter",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Enter)); list.append(new AutoTypeKey(Qt::Key_Enter));
} }
else if (tmplName == "up") { else if (tmplName.compare("up",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Up)); list.append(new AutoTypeKey(Qt::Key_Up));
} }
else if (tmplName == "down") { else if (tmplName.compare("down",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Down)); list.append(new AutoTypeKey(Qt::Key_Down));
} }
else if (tmplName == "left") { else if (tmplName.compare("left",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Left)); list.append(new AutoTypeKey(Qt::Key_Left));
} }
else if (tmplName == "right") { else if (tmplName.compare("right",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Right)); list.append(new AutoTypeKey(Qt::Key_Right));
} }
else if (tmplName == "insert" || tmplName == "ins") { else if (tmplName.compare("insert",Qt::CaseInsensitive)==0 ||
tmplName.compare("ins",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Insert)); list.append(new AutoTypeKey(Qt::Key_Insert));
} }
else if (tmplName == "delete" || tmplName == "del") { else if (tmplName.compare("delete",Qt::CaseInsensitive)==0 ||
tmplName.compare("del",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Delete)); list.append(new AutoTypeKey(Qt::Key_Delete));
} }
else if (tmplName == "home") { else if (tmplName.compare("home",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Home)); list.append(new AutoTypeKey(Qt::Key_Home));
} }
else if (tmplName == "end") { else if (tmplName.compare("end",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_End)); list.append(new AutoTypeKey(Qt::Key_End));
} }
else if (tmplName == "pgup") { else if (tmplName.compare("pgup",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_PageUp)); list.append(new AutoTypeKey(Qt::Key_PageUp));
} }
else if (tmplName == "pgdown") { else if (tmplName.compare("pgdown",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_PageDown)); list.append(new AutoTypeKey(Qt::Key_PageDown));
} }
else if (tmplName == "backspace" || tmplName == "bs" || tmplName == "bksp") { else if (tmplName.compare("backspace",Qt::CaseInsensitive)==0 ||
tmplName.compare("bs",Qt::CaseInsensitive)==0 ||
tmplName.compare("bksp",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Backspace)); list.append(new AutoTypeKey(Qt::Key_Backspace));
} }
else if (tmplName == "break") { else if (tmplName.compare("break",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Pause)); list.append(new AutoTypeKey(Qt::Key_Pause));
} }
else if (tmplName == "capslock") { else if (tmplName.compare("capslock",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_CapsLock)); list.append(new AutoTypeKey(Qt::Key_CapsLock));
} }
else if (tmplName == "esc") { else if (tmplName.compare("esc",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Escape)); list.append(new AutoTypeKey(Qt::Key_Escape));
} }
else if (tmplName == "help") { else if (tmplName.compare("help",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Help)); list.append(new AutoTypeKey(Qt::Key_Help));
} }
else if (tmplName == "numlock") { else if (tmplName.compare("numlock",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_NumLock)); list.append(new AutoTypeKey(Qt::Key_NumLock));
} }
else if (tmplName == "ptrsc") { else if (tmplName.compare("ptrsc",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_Print)); list.append(new AutoTypeKey(Qt::Key_Print));
} }
else if (tmplName == "scrolllock") { else if (tmplName.compare("scrolllock",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeKey(Qt::Key_ScrollLock)); list.append(new AutoTypeKey(Qt::Key_ScrollLock));
} }
// Qt doesn't know about keypad keys so use the normal ones instead // Qt doesn't know about keypad keys so use the normal ones instead
else if (tmplName == "add" || tmplName == "+") { else if (tmplName.compare("add",Qt::CaseInsensitive)==0 ||
tmplName.compare("+",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('+')); list.append(new AutoTypeChar('+'));
} }
else if (tmplName == "subtract") { else if (tmplName.compare("subtract",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('-')); list.append(new AutoTypeChar('-'));
} }
else if (tmplName == "multiply") { else if (tmplName.compare("multiply",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('*')); list.append(new AutoTypeChar('*'));
} }
else if (tmplName == "divide") { else if (tmplName.compare("divide",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('/')); list.append(new AutoTypeChar('/'));
} }
else if (tmplName == "^") { else if (tmplName.compare("^",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('^')); list.append(new AutoTypeChar('^'));
} }
else if (tmplName == "%") { else if (tmplName.compare("%",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('%')); list.append(new AutoTypeChar('%'));
} }
else if (tmplName == "~") { else if (tmplName.compare("~",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('~')); list.append(new AutoTypeChar('~'));
} }
else if (tmplName == "(") { else if (tmplName.compare("(",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('(')); list.append(new AutoTypeChar('('));
} }
else if (tmplName == ")") { else if (tmplName.compare(")",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar(')')); list.append(new AutoTypeChar(')'));
} }
else if (tmplName == "{") { else if (tmplName.compare("{",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('{')); list.append(new AutoTypeChar('{'));
} }
else if (tmplName == "}") { else if (tmplName.compare("}",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeChar('}')); list.append(new AutoTypeChar('}'));
} }
else { else {
@ -499,10 +504,10 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
} }
if (tmplName == "delay" && num > 0) { if (tmplName.compare("delay",Qt::CaseInsensitive)==0 && num > 0) {
list.append(new AutoTypeDelay(num)); list.append(new AutoTypeDelay(num));
} }
else if (tmplName == "clearfield") { else if (tmplName.compare("clearfield",Qt::CaseInsensitive)==0) {
list.append(new AutoTypeClearField()); list.append(new AutoTypeClearField());
} }
@ -510,9 +515,8 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
return list; return list;
} }
const QString placeholder = QString("{%1}").arg(tmplName); const QString placeholder = QString("{%1}").arg(tmplName);
const QString resolved = entry->resolvePlaceholders(placeholder); const QString resolved = entry->resolvePlaceholder(placeholder);
if (placeholder != resolved) { if (placeholder != resolved) {
for (const QChar& ch : resolved) { for (const QChar& ch : resolved) {
if (ch == '\n') { if (ch == '\n') {

39
src/core/Entry.cpp
View file

@ -616,17 +616,40 @@ const Database* Entry::database() const
} }
} }
QString Entry::resolvePlaceholders(const QString& str) const QString Entry::resolveMultiplePlaceholders(const QString& str) const
{ {
QString result = str; QString result = str;
QRegExp tmplRegEx("({.*})", Qt::CaseInsensitive, QRegExp::RegExp2);
QStringList tmplList;
int pos = 0;
result.replace("{TITLE}", title(), Qt::CaseInsensitive); while ((pos = tmplRegEx.indexIn(str, pos)) != -1) {
result.replace("{USERNAME}", username(), Qt::CaseInsensitive); QString found = tmplRegEx.cap(1);
result.replace("{URL}", url(), Qt::CaseInsensitive); result.replace(found,resolvePlaceholder(found));
result.replace("{PASSWORD}", password(), Qt::CaseInsensitive); pos += tmplRegEx.matchedLength();
result.replace("{NOTES}", notes(), Qt::CaseInsensitive); }
// TODO: lots of other placeholders missing return result;
}
QString Entry::resolvePlaceholder(const QString& str) const
{
QString result = str;
const QList<QString> keyList = attributes()->keys();
for (const QString& key : keyList) {
Qt::CaseSensitivity cs = Qt::CaseInsensitive;
if (!EntryAttributes::isDefaultAttribute(key)) {
cs = Qt::CaseSensitive;
}
QString k = key;
k.prepend("{").append("}");
if (result.compare(k,cs)==0) {
result.replace(result,attributes()->value(key));
break;
}
}
return result; return result;
} }

3
src/core/Entry.h
View file

@ -127,7 +127,8 @@ public:
*/ */
Entry* clone(CloneFlags flags) const; Entry* clone(CloneFlags flags) const;
void copyDataFrom(const Entry* other); void copyDataFrom(const Entry* other);
QString resolvePlaceholders(const QString& str) const; QString resolveMultiplePlaceholders(const QString& str) const;
QString resolvePlaceholder(const QString& str) const;
/** /**
* Call before and after set*() methods to create a history item * Call before and after set*() methods to create a history item

4
src/core/Group.cpp
View file

@ -201,6 +201,10 @@ QString Group::effectiveAutoTypeSequence() const
group = group->parentGroup(); group = group->parentGroup();
} while (group && sequence.isEmpty()); } while (group && sequence.isEmpty());
if (sequence.isEmpty()) {
sequence = "{USERNAME}{TAB}{PASSWORD}{ENTER}";
}
return sequence; return sequence;
} }

2
src/gui/DatabaseWidget.cpp
View file

@ -485,7 +485,7 @@ void DatabaseWidget::openUrl()
void DatabaseWidget::openUrlForEntry(Entry* entry) void DatabaseWidget::openUrlForEntry(Entry* entry)
{ {
QString urlString = entry->resolvePlaceholders(entry->url()); QString urlString = entry->resolveMultiplePlaceholders(entry->url());
if (urlString.isEmpty()) { if (urlString.isEmpty()) {
return; return;
} }

32
tests/TestAutoType.cpp
View file

@ -90,6 +90,20 @@ void TestAutoType::init()
association.window = "//^REGEX3-([rd]\\d){2}$//"; association.window = "//^REGEX3-([rd]\\d){2}$//";
association.sequence = "regex3"; association.sequence = "regex3";
m_entry3->autoTypeAssociations()->add(association); m_entry3->autoTypeAssociations()->add(association);
m_entry4 = new Entry();
m_entry4->setGroup(m_group);
m_entry4->setPassword("custom_attr");
m_entry4->attributes()->set("CUSTOM","Attribute",false);
association.window = "//^CustomAttr1$//";
association.sequence = "{PASSWORD}:{CUSTOM}";
m_entry4->autoTypeAssociations()->add(association);
association.window = "//^CustomAttr2$//";
association.sequence = "{CuStOm}";
m_entry4->autoTypeAssociations()->add(association);
association.window = "//^CustomAttr3$//";
association.sequence = "{PaSSworD}";
m_entry4->autoTypeAssociations()->add(association);
} }
void TestAutoType::cleanup() void TestAutoType::cleanup()
@ -192,4 +206,22 @@ void TestAutoType::testGlobalAutoTypeRegExp()
m_autoType->performGlobalAutoType(m_dbList); m_autoType->performGlobalAutoType(m_dbList);
QCOMPARE(m_test->actionChars(), QString("regex3")); QCOMPARE(m_test->actionChars(), QString("regex3"));
m_test->clearActions(); m_test->clearActions();
// with custom attributes
m_test->setActiveWindowTitle("CustomAttr1");
m_autoType->performGlobalAutoType(m_dbList);
QCOMPARE(m_test->actionChars(), QString("custom_attr:Attribute"));
m_test->clearActions();
// with (non uppercase) undefined custom attributes
m_test->setActiveWindowTitle("CustomAttr2");
m_autoType->performGlobalAutoType(m_dbList);
QCOMPARE(m_test->actionChars(), QString(""));
m_test->clearActions();
// with mixedcase default attributes
m_test->setActiveWindowTitle("CustomAttr3");
m_autoType->performGlobalAutoType(m_dbList);
QCOMPARE(m_test->actionChars(), QString("custom_attr"));
m_test->clearActions();
} }

1
tests/TestAutoType.h
View file

@ -55,6 +55,7 @@ private:
Entry* m_entry1; Entry* m_entry1;
Entry* m_entry2; Entry* m_entry2;
Entry* m_entry3; Entry* m_entry3;
Entry* m_entry4;
}; };
#endif // KEEPASSX_TESTAUTOTYPE_H #endif // KEEPASSX_TESTAUTOTYPE_H