LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

RPC console: escaping within ' and " now handled differently

Browse source 
Should now mimic bash quoting and escaping (see http://wiki.bash-hackers.org/syntax/quoting) exactly,
leaving out argument expansion and obscure syntax like $''.
This commit is contained in:
Wladimir J. van der Laan 2012-08-30 21:42:18 +02:00
parent ddbddcb31e
commit 9c94bdac06
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/qt/rpcconsole.cpp
View file

@ -58,11 +58,11 @@ void RPCExecutor::start()
* *
* - Arguments are delimited with whitespace * - Arguments are delimited with whitespace
* - Extra whitespace at the beginning and end and between arguments will be ignored * - Extra whitespace at the beginning and end and between arguments will be ignored
* - Arguments can be "double" or 'single' quoted. Those are treated the same. * - Text can be "double" or 'single' quoted
* - The backslash '\' is used as escape character * - The backslash \c \ is used as escape character
* - Outside quotes, any character can be escaped * - Outside quotes, any character can be escaped
* - Within double quotes, only escape double quotes with \" and backslashes with \\ * - Within double quotes, only escape \c " and backslashes before a \c " or another backslash
* - Within single quotes, only escape single quotes with \' and backslashes with \\ * - Within single quotes, no escaping is possible and no special interpretation takes place
* *
* @param[out] args Parsed arguments will be appended to this list * @param[out] args Parsed arguments will be appended to this list
* @param[in] strCommand Command line to split * @param[in] strCommand Command line to split
@ -76,7 +76,6 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
STATE_SINGLEQUOTED, STATE_SINGLEQUOTED,
STATE_DOUBLEQUOTED, STATE_DOUBLEQUOTED,
STATE_ESCAPE_OUTER, STATE_ESCAPE_OUTER,
STATE_ESCAPE_SINGLEQUOTED,
STATE_ESCAPE_DOUBLEQUOTED STATE_ESCAPE_DOUBLEQUOTED
} state = STATE_EATING_SPACES; } state = STATE_EATING_SPACES;
std::string curarg; std::string curarg;
@ -84,8 +83,8 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
{ {
switch(state) switch(state)
{ {
case STATE_ARGUMENT: // After argument case STATE_ARGUMENT: // In or after argument
case STATE_EATING_SPACES: // Handle runs of spaces case STATE_EATING_SPACES: // Handle runs of whitespace
switch(ch) switch(ch)
{ {
case '"': state = STATE_DOUBLEQUOTED; break; case '"': state = STATE_DOUBLEQUOTED; break;
@ -106,7 +105,6 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
switch(ch) switch(ch)
{ {
case '\'': state = STATE_ARGUMENT; break; case '\'': state = STATE_ARGUMENT; break;
case '\\': state = STATE_ESCAPE_SINGLEQUOTED; break;
default: curarg += ch; default: curarg += ch;
} }
break; break;
@ -121,12 +119,8 @@ bool parseCommandLine(std::vector<std::string> &args, const std::string &strComm
case STATE_ESCAPE_OUTER: // '\' outside quotes case STATE_ESCAPE_OUTER: // '\' outside quotes
curarg += ch; state = STATE_ARGUMENT; curarg += ch; state = STATE_ARGUMENT;
break; break;
case STATE_ESCAPE_SINGLEQUOTED: // '\' in single-quoted text
if(ch != '\'') curarg += '\\'; // keep '\' for everything but the quote
curarg += ch; state = STATE_SINGLEQUOTED;
break;
case STATE_ESCAPE_DOUBLEQUOTED: // '\' in double-quoted text case STATE_ESCAPE_DOUBLEQUOTED: // '\' in double-quoted text
if(ch != '"') curarg += '\\'; // keep '\' for everything but the quote if(ch != '"' && ch != '\\') curarg += '\\'; // keep '\' for everything but the quote and '\' itself
curarg += ch; state = STATE_DOUBLEQUOTED; curarg += ch; state = STATE_DOUBLEQUOTED;
break; break;
} }
@ -181,8 +175,7 @@ void RPCExecutor::request(const QString &command)
emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")"); emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(message) + " (code " + QString::number(code) + ")");
} }
catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message
{ { // Show raw JSON object
// Show raw JSON object
emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
} }
} }