mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-01-17 18:40:09 +00:00
Qt/RPCConsole: Truncate filtered commands to just the command name, rather than skip it entirely in history
This commit is contained in:
parent
d80a00660f
commit
1755c04576
@ -74,14 +74,14 @@ const QStringList historyFilter = QStringList()
|
|||||||
<< "walletpassphrasechange"
|
<< "walletpassphrasechange"
|
||||||
<< "encryptwallet";
|
<< "encryptwallet";
|
||||||
|
|
||||||
bool command_may_contain_sensitive_data(const QString cmd)
|
QString command_filter_sensitive_data(const QString cmd)
|
||||||
{
|
{
|
||||||
Q_FOREACH(QString unallowedCmd, historyFilter) {
|
Q_FOREACH(QString unallowedCmd, historyFilter) {
|
||||||
if (cmd.trimmed().startsWith(unallowedCmd)) {
|
if (cmd.trimmed().startsWith(unallowedCmd)) {
|
||||||
return true;
|
return unallowedCmd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -779,20 +779,18 @@ void RPCConsole::on_lineEdit_returnPressed()
|
|||||||
message(CMD_REQUEST, cmd);
|
message(CMD_REQUEST, cmd);
|
||||||
Q_EMIT cmdRequest(cmd);
|
Q_EMIT cmdRequest(cmd);
|
||||||
|
|
||||||
bool storeHistory = !command_may_contain_sensitive_data(cmd);
|
cmd = command_filter_sensitive_data(cmd);
|
||||||
|
|
||||||
|
// Remove command, if already in history
|
||||||
|
history.removeOne(cmd);
|
||||||
|
// Append command to history
|
||||||
|
history.append(cmd);
|
||||||
|
// Enforce maximum history size
|
||||||
|
while(history.size() > CONSOLE_HISTORY)
|
||||||
|
history.removeFirst();
|
||||||
|
// Set pointer to end of history
|
||||||
|
historyPtr = history.size();
|
||||||
|
|
||||||
if (storeHistory)
|
|
||||||
{
|
|
||||||
// Remove command, if already in history
|
|
||||||
history.removeOne(cmd);
|
|
||||||
// Append command to history
|
|
||||||
history.append(cmd);
|
|
||||||
// Enforce maximum history size
|
|
||||||
while(history.size() > CONSOLE_HISTORY)
|
|
||||||
history.removeFirst();
|
|
||||||
// Set pointer to end of history
|
|
||||||
historyPtr = history.size();
|
|
||||||
}
|
|
||||||
// Scroll console view to end
|
// Scroll console view to end
|
||||||
scrollToEnd();
|
scrollToEnd();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user