From 13fe258e91e7a92326aedf151c571994166a06d4 Mon Sep 17 00:00:00 2001 From: MeshCollider Date: Tue, 16 Oct 2018 18:19:40 +1300 Subject: Error if rpcpassword in conf contains a hash character --- src/util/system.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/system.cpp b/src/util/system.cpp index 4f5dd2d6e9..f6f36c2238 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -826,8 +826,10 @@ static bool GetConfigOptions(std::istream& stream, std::string& error, std::vect std::string::size_type pos; int linenr = 1; while (std::getline(stream, str)) { + bool used_hash = false; if ((pos = str.find('#')) != std::string::npos) { str = str.substr(0, pos); + used_hash = true; } const static std::string pattern = " \t\r\n"; 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) { std::string name = prefix + TrimString(str.substr(0, pos), 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); } else { error = strprintf("parse error on line %i: %s", linenr, str); -- cgit v1.2.3 From 0385109444646561a718f34ae437b7e0e4d4d5bc Mon Sep 17 00:00:00 2001 From: MeshCollider Date: Tue, 16 Oct 2018 18:19:53 +1300 Subject: Add test for rpcpassword hash error --- test/functional/feature_config_args.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 492772d5e3..88a9aadc7b 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -29,6 +29,10 @@ class ConfArgsTest(BitcoinTestFramework): conf.write('nono\n') self.nodes[0].assert_start_raises_init_error(expected_msg='Error reading configuration file: parse error on line 1: nono, if you intended to specify a negated option, use nono=1 instead') + with open(inc_conf_file_path, 'w', encoding='utf-8') as conf: + conf.write('server=1\nrpcuser=someuser\nrpcpassword=some#pass') + self.nodes[0].assert_start_raises_init_error(expected_msg='Error reading configuration file: parse error on line 3, using # in rpcpassword can be ambiguous and should be avoided') + with open(inc_conf_file_path, 'w', encoding='utf-8') as conf: conf.write('') # clear -- cgit v1.2.3