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

fix regular expressions for delays and repetition

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

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

@ -770,43 +770,67 @@ void EditEntryWidget::updateEntryData(Entry* entry) const
QString allowRepetition = "(\\s[0-9]*){0,1}"; QString allowRepetition = "(\\s[0-9]*){0,1}";
QString normalCommands = "[A-Z]*" + allowRepetition; QString normalCommands = "[A-Z]*" + allowRepetition;
QString specialLiterals = "[\\^\\%\\(\\)~\\{\\}\\[\\]\\+-]" + allowRepetition; QString specialLiterals = "[\\^\\%\\(\\)~\\{\\}\\[\\]\\+-]" + allowRepetition;
QString functionKeys = "(F[1-9]" +allowRepetition + "|F1[0-2])" + allowRepetition; QString functionKeys = "(F[1-9]" + allowRepetition + "|F1[0-2])" + allowRepetition;
QString numpad = "NUMPAD[0-9]" + allowRepetition; QString numpad = "NUMPAD[0-9]" + allowRepetition;
QString delay = "DELAY=[0-9]+"; QString delay = "DELAY=[0-9]+";
QString beep = "BEEP\\s[0-9]*\\s[0-9]*"; QString beep = "BEEP\\s[0-9]*\\s[0-9]*";
QString vkey = "VKEY-[EN]X" + allowRepetition; QString vkey = "VKEY(-[EN]X){0,1}" + allowRepetition;
//these arent in parenthesis //these arent in parenthesis
QString shortcutKeys = "[\\^\\%~\\+@]"; QString shortcutKeys = "[\\^\\%~\\+@]";
QString fixedStrings = "[^\\^\\%~\\+@\\{\\}]*"; QString fixedStrings = "[^\\^\\%~\\+@\\{\\}]*";
QRegExp autoTypeSyntax QRegExp autoTypeSyntax
("("+shortcutKeys + "|" + fixedStrings + "|\\{(" + normalCommands + "|" + specialLiterals + "|" + functionKeys ("(" + shortcutKeys + "|" + fixedStrings + "|\\{(" + normalCommands + "|" + specialLiterals + "|"
+ "|" + numpad + "|" + delay + "|" + beep + "|" + vkey+")\\})*"); + functionKeys
+ "|" + numpad + "|" + delay + "|" + beep + "|" + vkey + ")\\})*");
autoTypeSyntax.setCaseSensitivity(Qt::CaseInsensitive); autoTypeSyntax.setCaseSensitivity(Qt::CaseInsensitive);
autoTypeSyntax.setPatternSyntax(QRegExp::RegExp); autoTypeSyntax.setPatternSyntax(QRegExp::RegExp);
QRegExp highDelay(".*\\{Delay\\s[0-9]{5,}\\}.*"); //the 3 means 3 digitnumbers are too much
highDelay.setCaseSensitivity(Qt::CaseInsensitive);
highDelay.setPatternSyntax(QRegExp::RegExp);
QRegExp highRepetition(".*\\s[0-9]{3,}.*");
highRepetition.setPatternSyntax(QRegExp::RegExp);
//small test @TODO delete //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}"))) { 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"; std::cout << "yes\n";
} }
if(autoTypeSyntax.exactMatch(QString("word 23}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) { if (autoTypeSyntax
.exactMatch(QString("word 23}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) {
std::cout << "no1\n"; std::cout << "no1\n";
} }
if(autoTypeSyntax.exactMatch(QString("{@}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) { if (autoTypeSyntax
.exactMatch(QString("{@}{F1 23}{~ 23}{% 23}{^}{F12}{(}{) 23}{[}{[}{]}{Delay=23}{+}{-}~+%@fixeds"))) {
std::cout << "no2\n"; std::cout << "no2\n";
} }
if (highDelay.exactMatch("{asfd}{DELAY 10000}{dasf}")) {
std::cout << "yes1\n";
}
if (highDelay.exactMatch("{asfd}{DELAY 1000}{dasf}")) {
std::cout << "no3\n";
}
if (highRepetition.exactMatch("{asfd}{DELAY 100}{dasf}")) {
std::cout << "yes2\n";
}
if (highRepetition.exactMatch("{asfd}{DELAY 10}{dasf}")) {
std::cout << "no4\n";
}
//@TODO restrict repetition only on normal commands and delay
QRegExp highRepetition(".*[0-9]{3,}.*"); //the 3 means 3 digitnumbers are too much
highRepetition.setPatternSyntax(QRegExp::RegExp);
if (!autoTypeSyntax.exactMatch(m_autoTypeUi->sequenceEdit->text())) { if (!autoTypeSyntax.exactMatch(m_autoTypeUi->sequenceEdit->text())) {
//@TODO handle wrong syntax //@TODO handle wrong syntax
} }
if (!highRepetition.exactMatch(m_autoTypeUi->sequenceEdit->text())) { else if (highDelay.exactMatch(m_autoTypeUi->sequenceEdit->text())) {
//@TODO handle too long delay
}
else if (highRepetition.exactMatch(m_autoTypeUi->sequenceEdit->text())) {
//@TODO handle too much repetition //@TODO handle too much repetition
} }
entry->setDefaultAutoTypeSequence(m_autoTypeUi->sequenceEdit->text()); entry->setDefaultAutoTypeSequence(m_autoTypeUi->sequenceEdit->text());