mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
807720666c
fad0867d6ab9430070aa7d60bf7617a6508e0586 Cleanup -includeconf error message (MarcoFalke)
fa9f711c3746ca3962f15224285a453744cd45b3 Fix crash when parsing command line with -noincludeconf=0 (MarcoFalke)
Pull request description:
The error message has several issues:
* It may crash instead of cleanly shutting down, when `-noincludeconf=0` is passed
* It doesn't quote the value
* It includes an erroneous trailing `\n`
* It is redundantly mentioning `"-includeconf cannot be used from commandline;"` several times, when once should be more than sufficient
Fix all issues by:
* Replacing `get_str()` with `write()` to fix the crash and quoting issue
* Remove the `\n` and only print the first value to fix the other issues
Before:
```
$ ./src/bitcoind -noincludeconf=0
terminate called after throwing an instance of 'std::runtime_error'
what(): JSON value is not a string as expected
Aborted (core dumped)
$ ./src/bitcoind -includeconf='a b' -includeconf=c
Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=a b
-includeconf cannot be used from commandline; -includeconf=c
```
After:
```
$ ./src/bitcoind -noincludeconf=0
Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true
$ ./src/bitcoind -includeconf='a b' -includeconf=c
Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf="a b"
```
Hopefully fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34493
Testcase: https://github.com/bitcoin/bitcoin/files/6515429/clusterfuzz-testcase-minimized-system-6328535926046720.log
```
FUZZ=system ./src/test/fuzz/fuzz ./clusterfuzz-testcase-minimized-system-6328535926046720.log
```
See https://github.com/bitcoin/bitcoin/blob/master/doc/fuzzing.md
ACKs for top commit:
sipa:
utACK fad0867d6ab9430070aa7d60bf7617a6508e0586
Tree-SHA512: b44af93be6bf71b43669058c1449c4c6999f03b5b01b429851b149b12d77733408cb207e9a3edc6f0bffd6030c4c52165e8e23a1c2718ff5082a6ba254cc94a4
90 lines
4.3 KiB
Python
Executable File
90 lines
4.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2018 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Tests the includeconf argument
|
|
|
|
Verify that:
|
|
|
|
1. adding includeconf to the configuration file causes the includeconf
|
|
file to be loaded in the correct order.
|
|
2. includeconf cannot be used as a command line argument.
|
|
3. includeconf cannot be used recursively (ie includeconf can only
|
|
be used from the base config file).
|
|
4. multiple includeconf arguments can be specified in the main config
|
|
file.
|
|
"""
|
|
import os
|
|
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
|
|
class IncludeConfTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.setup_clean_chain = False
|
|
self.num_nodes = 1
|
|
|
|
def setup_chain(self):
|
|
super().setup_chain()
|
|
# Create additional config files
|
|
# - tmpdir/node0/relative.conf
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
|
|
f.write("uacomment=relative\n")
|
|
# - tmpdir/node0/relative2.conf
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative2.conf"), "w", encoding="utf8") as f:
|
|
f.write("uacomment=relative2\n")
|
|
with open(os.path.join(self.options.tmpdir, "node0", "dash.conf"), "a", encoding='utf8') as f:
|
|
f.write("uacomment=main\nincludeconf=relative.conf\n")
|
|
|
|
def run_test(self):
|
|
self.log.info("-includeconf works from config file. subversion should end with 'main; relative)/'")
|
|
|
|
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
|
assert subversion.endswith("main; relative)/")
|
|
|
|
self.log.info("-includeconf cannot be used as command-line arg")
|
|
self.stop_node(0)
|
|
self.nodes[0].assert_start_raises_init_error(
|
|
extra_args=['-noincludeconf=0'],
|
|
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf=true',
|
|
)
|
|
self.nodes[0].assert_start_raises_init_error(
|
|
extra_args=['-includeconf=relative2.conf', '-includeconf=no_warn.conf'],
|
|
expected_msg='Error: Error parsing command line arguments: -includeconf cannot be used from commandline; -includeconf="relative2.conf"',
|
|
)
|
|
|
|
self.log.info("-includeconf cannot be used recursively. subversion should end with 'main; relative)/'")
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "a", encoding="utf8") as f:
|
|
f.write("includeconf=relative2.conf\n")
|
|
self.start_node(0)
|
|
|
|
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
|
assert subversion.endswith("main; relative)/")
|
|
self.stop_node(0, expected_stderr="warning: -includeconf cannot be used from included files; ignoring -includeconf=relative2.conf")
|
|
|
|
self.log.info("-includeconf cannot contain invalid arg")
|
|
|
|
# Commented out as long as we ignore invalid arguments in configuration files
|
|
#with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
|
|
# f.write("foo=bar\n")
|
|
#self.nodes[0].assert_start_raises_init_error(expected_msg="Error: Error reading configuration file: Invalid configuration value foo")
|
|
|
|
self.log.info("-includeconf cannot be invalid path")
|
|
os.remove(os.path.join(self.options.tmpdir, "node0", "relative.conf"))
|
|
self.nodes[0].assert_start_raises_init_error(expected_msg="Error: Error reading configuration file: Failed to include configuration file relative.conf")
|
|
|
|
self.log.info("multiple -includeconf args can be used from the base config file. subversion should end with 'main; relative; relative2)/'")
|
|
with open(os.path.join(self.options.tmpdir, "node0", "relative.conf"), "w", encoding="utf8") as f:
|
|
# Restore initial file contents
|
|
f.write("uacomment=relative\n")
|
|
|
|
with open(os.path.join(self.options.tmpdir, "node0", "dash.conf"), "a", encoding='utf8') as f:
|
|
f.write("includeconf=relative2.conf\n")
|
|
|
|
self.start_node(0)
|
|
|
|
subversion = self.nodes[0].getnetworkinfo()["subversion"]
|
|
assert subversion.endswith("main; relative; relative2)/")
|
|
|
|
if __name__ == '__main__':
|
|
IncludeConfTest().main()
|