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

Error if rpcpassword in conf contains a hash character

Browse source
This commit is contained in:
MeshCollider 2018-10-16 18:19:40 +13:00
parent 1ba5583646
commit 13fe258e91
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/system.cpp
View file

@ -826,8 +826,10 @@ static bool GetConfigOptions(std::istream& stream, std::string& error, std::vect
std::string::size_type pos; std::string::size_type pos;
int linenr = 1; int linenr = 1;
while (std::getline(stream, str)) { while (std::getline(stream, str)) {
bool used_hash = false;
if ((pos = str.find('#')) != std::string::npos) { if ((pos = str.find('#')) != std::string::npos) {
str = str.substr(0, pos); str = str.substr(0, pos);
used_hash = true;
} }
const static std::string pattern = " \t\r\n"; const static std::string pattern = " \t\r\n";
str = TrimString(str, pattern); str = TrimString(str, pattern);
@ -840,6 +842,10 @@ static bool GetConfigOptions(std::istream& stream, std::string& error, std::vect
} else if ((pos = str.find('=')) != std::string::npos) { } else if ((pos = str.find('=')) != std::string::npos) {
std::string name = prefix + TrimString(str.substr(0, pos), pattern); std::string name = prefix + TrimString(str.substr(0, pos), pattern);
std::string value = TrimString(str.substr(pos + 1), pattern); std::string value = TrimString(str.substr(pos + 1), pattern);
if (used_hash && name == "rpcpassword") {
error = strprintf("parse error on line %i, using # in rpcpassword can be ambiguous and should be avoided", linenr);
return false;
}
options.emplace_back(name, value); options.emplace_back(name, value);
} else { } else {
error = strprintf("parse error on line %i: %s", linenr, str); error = strprintf("parse error on line %i: %s", linenr, str);