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

Extended autotype syntax to allow all things in keepass2

Browse source
This commit is contained in:
Marco 2017-05-15 11:42:13 +02:00 • committed by thez3ro
parent 4fcedc2187
commit d524aea779
No known key found for this signature in database
GPG key ID: F628F9E41DD7C073
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/autotype/AutoType.cpp
View file

@ -20,6 +20,7 @@
#include <QApplication> #include <QApplication>
#include <QPluginLoader> #include <QPluginLoader>
#include <iostream>
#include "config-keepassx.h" #include "config-keepassx.h"
@ -396,7 +397,7 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
reply = QMessageBox::question(0, reply = QMessageBox::question(0,
"AutoType", "AutoType",
"This AutoType command contains a very long delay. Do you really want to execute it?"); tr("This AutoType command contains a very long delay. Do you really want to execute it?"));
if (reply == QMessageBox::No) { if (reply == QMessageBox::No) {
return list; return list;
@ -407,7 +408,7 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
reply = QMessageBox::question(0, reply = QMessageBox::question(0,
"AutoType", "AutoType",
"This AutoType command contains arguments which are repeated very often. Do you really want to execute it?"); tr("This AutoType command contains arguments which are repeated very often. Do you really want to execute it?"));
if (reply == QMessageBox::No) { if (reply == QMessageBox::No) {
return list; return list;

33
src/gui/entry/EditEntryWidget.cpp
View file

@ -31,6 +31,7 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QMimeData> #include <QMimeData>
#include <QEvent> #include <QEvent>
#include <iostream>
#include "core/Config.h" #include "core/Config.h"
#include "core/Database.h" #include "core/Database.h"
@ -764,11 +765,41 @@ void EditEntryWidget::updateEntryData(Entry* entry) const
entry->setDefaultAutoTypeSequence(QString()); entry->setDefaultAutoTypeSequence(QString());
} }
else { else {
QRegExp autoTypeSyntax("(\\{[A-Z]*(\\s[0-9]*){0,1}\\})*"); //checks things like {word 23}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixedstring
QString allowRepetition = "(\\s[0-9]*){0,1}";
QString normalCommands = "[A-Z]*" + allowRepetition;
QString specialLiterals = "[\\^\\%\\(\\)~\\{\\}\\[\\]\\+-]" + allowRepetition;
QString functionKeys = "(F[1-9]" +allowRepetition + "|F1[0-2])" + allowRepetition;
QString numpad = "NUMPAD[0-9]" + allowRepetition;
QString delay = "DELAY=[0-9]+";
QString beep = "BEEP\\s[0-9]*\\s[0-9]*";
QString vkey = "VKEY-[EN]X" + allowRepetition;
//these arent in parenthesis
QString shortcutKeys = "[\\^\\%~\\+@]";
QString fixedStrings = "[^\\^\\%~\\+@\\{\\}]*";
QRegExp autoTypeSyntax
("("+shortcutKeys + "|" + fixedStrings + "|\\{(" + normalCommands + "|" + specialLiterals + "|" + functionKeys
+ "|" + numpad + "|" + delay + "|" + beep + "|" + vkey+")\\})*");
autoTypeSyntax.setCaseSensitivity(Qt::CaseInsensitive); autoTypeSyntax.setCaseSensitivity(Qt::CaseInsensitive);
autoTypeSyntax.setPatternSyntax(QRegExp::RegExp); autoTypeSyntax.setPatternSyntax(QRegExp::RegExp);
//small test @TODO delete
if(autoTypeSyntax.exactMatch(QString("{word 23}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds{Beep 23 32}{Vkey-NX 34}"))) {
std::cout << "yes\n";
}
if(autoTypeSyntax.exactMatch(QString("word 23}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) {
std::cout << "no1\n";
}
if(autoTypeSyntax.exactMatch(QString("{@}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) {
std::cout << "no2\n";
}
//@TODO restrict repetition only on normal commands and delay
QRegExp highRepetition(".*[0-9]{3,}.*"); //the 3 means 3 digitnumbers are too much QRegExp highRepetition(".*[0-9]{3,}.*"); //the 3 means 3 digitnumbers are too much
highRepetition.setPatternSyntax(QRegExp::RegExp); highRepetition.setPatternSyntax(QRegExp::RegExp);