diff options
author | MeshCollider <dobsonsa68@gmail.com> | 2019-01-03 23:54:19 +1300 |
---|---|---|
committer | MeshCollider <dobsonsa68@gmail.com> | 2019-01-09 17:32:35 +1300 |
commit | 8cff83124bcac936ecc6add6dca72b125a79a08f (patch) | |
tree | 115734b79c3499e49865e52c1ae2272aa1dd053d | |
parent | 031e3a32b2453211af0b651af1e01c1b9c31be2f (diff) | |
download | bitcoin-8cff83124bcac936ecc6add6dca72b125a79a08f.tar.xz |
Error if rpcpassword contains hash in conf sections
-rw-r--r-- | src/util/system.cpp | 2 | ||||
-rwxr-xr-x | test/functional/feature_config_args.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/util/system.cpp b/src/util/system.cpp index 8e201ec590..ffe4d21ee3 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -865,7 +865,7 @@ 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") { + if (used_hash && name.find("rpcpassword") != std::string::npos) { error = strprintf("parse error on line %i, using # in rpcpassword can be ambiguous and should be avoided", linenr); return false; } diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index d87eabaa6d..4b3f6603a2 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -34,6 +34,14 @@ class ConfArgsTest(BitcoinTestFramework): 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('server=1\nrpcuser=someuser\nmain.rpcpassword=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('server=1\nrpcuser=someuser\n[main]\nrpcpassword=some#pass') + self.nodes[0].assert_start_raises_init_error(expected_msg='Error reading configuration file: parse error on line 4, using # in rpcpassword can be ambiguous and should be avoided') + + with open(inc_conf_file_path, 'w', encoding='utf-8') as conf: conf.write('testnot.datadir=1\n[testnet]\n') self.restart_node(0) self.nodes[0].stop_node(expected_stderr='Warning: Section [testnet] is not recognized.' + os.linesep + 'Warning: Section [testnot] is not recognized.') |