Qt/RPCConsole: Refactor command_may_contain_sensitive_data function out of RPCConsole::on_lineEdit_returnPressed

This commit is contained in:
Luke Dashjr 2016-10-04 04:17:27 +00:00
parent de8980df9d
commit afde12f265
2 changed files with 16 additions and 11 deletions

View file

@ -63,14 +63,28 @@ const struct {
{NULL, NULL}
};
namespace {
// don't add private key handling cmd's to the history
const QStringList RPCConsole::historyFilter = QStringList()
const QStringList historyFilter = QStringList()
<< "importprivkey"
<< "signrawtransaction"
<< "walletpassphrase"
<< "walletpassphrasechange"
<< "encryptwallet";
bool command_may_contain_sensitive_data(const QString cmd)
{
Q_FOREACH(QString unallowedCmd, historyFilter) {
if (cmd.trimmed().startsWith(unallowedCmd)) {
return true;
}
}
return false;
}
}
/* Object for executing console RPC commands in a separate thread.
*/
class RPCExecutor : public QObject
@ -764,15 +778,7 @@ void RPCConsole::on_lineEdit_returnPressed()
message(CMD_REQUEST, cmd);
Q_EMIT cmdRequest(cmd);
bool storeHistory = true;
Q_FOREACH(QString unallowedCmd, historyFilter)
{
if (cmd.trimmed().startsWith(unallowedCmd))
{
storeHistory = false;
break;
}
}
bool storeHistory = !command_may_contain_sensitive_data(cmd);
if (storeHistory)
{

View file

@ -140,7 +140,6 @@ private:
ClientModel *clientModel;
QStringList history;
int historyPtr;
const static QStringList historyFilter;
QString cmdBeforeBrowsing;
QList<NodeId> cachedNodeids;
const PlatformStyle *platformStyle;