Qt/RPCConsole: Don't store commands with potentially sensitive information in the history
Filters importprivkey, signrawtransaction, walletpassphrase, walletpassphrasechange, and encryptwallet
This commit is contained in:
parent
fc95daa97f
commit
9044908636
2 changed files with 29 additions and 9 deletions
|
@ -63,6 +63,14 @@ const struct {
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// don't add private key handling cmd's to the history
|
||||||
|
const QStringList RPCConsole::historyFilter = QStringList()
|
||||||
|
<< "importprivkey"
|
||||||
|
<< "signrawtransaction"
|
||||||
|
<< "walletpassphrase"
|
||||||
|
<< "walletpassphrasechange"
|
||||||
|
<< "encryptwallet";
|
||||||
|
|
||||||
/* Object for executing console RPC commands in a separate thread.
|
/* Object for executing console RPC commands in a separate thread.
|
||||||
*/
|
*/
|
||||||
class RPCExecutor : public QObject
|
class RPCExecutor : public QObject
|
||||||
|
@ -755,15 +763,26 @@ void RPCConsole::on_lineEdit_returnPressed()
|
||||||
|
|
||||||
message(CMD_REQUEST, cmd);
|
message(CMD_REQUEST, cmd);
|
||||||
Q_EMIT cmdRequest(cmd);
|
Q_EMIT cmdRequest(cmd);
|
||||||
// Remove command, if already in history
|
|
||||||
history.removeOne(cmd);
|
bool storeHistory = true;
|
||||||
// Append command to history
|
Q_FOREACH(QString unallowedCmd, historyFilter)
|
||||||
history.append(cmd);
|
{
|
||||||
// Enforce maximum history size
|
if (cmd.trimmed().startsWith(unallowedCmd))
|
||||||
while(history.size() > CONSOLE_HISTORY)
|
storeHistory = false; break;
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,7 @@ private:
|
||||||
ClientModel *clientModel;
|
ClientModel *clientModel;
|
||||||
QStringList history;
|
QStringList history;
|
||||||
int historyPtr;
|
int historyPtr;
|
||||||
|
const static QStringList historyFilter;
|
||||||
QString cmdBeforeBrowsing;
|
QString cmdBeforeBrowsing;
|
||||||
QList<NodeId> cachedNodeids;
|
QList<NodeId> cachedNodeids;
|
||||||
const PlatformStyle *platformStyle;
|
const PlatformStyle *platformStyle;
|
||||||
|
|
Loading…
Reference in a new issue