util: Properly handle -noincludeconf on command line

MarcoFalke · ryanofsky · apoelstra · commit 0896d0a278c2 · 2021-06-21T14:08:34.000Z
This bug was introduced in commit fad0867. Unit test Co-Authored-By: Russell Yanofsky <russ@yanofsky.org>
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -318,6 +318,25 @@ BOOST_FIXTURE_TEST_CASE(util_CheckValue, CheckValueTest)
     CheckValue(M::ALLOW_ANY, "-value=abc", Expect{"abc"}.String("abc").Int(0).Bool(false).List({"abc"}));
 }
 
+struct NoIncludeConfTest {
+    std::string Parse(const char* arg)
+    {
+        TestArgsManager test;
+        test.SetupArgs({{"-includeconf", ArgsManager::ALLOW_ANY}});
+        std::array<const char*, 2> argv{"ignored", arg};
+        std::string error;
+        (void)test.ParseParameters(argv.size(), argv.data(), error);
+        return error;
+    }
+};
+
+BOOST_FIXTURE_TEST_CASE(util_NoIncludeConf, NoIncludeConfTest)
+{
+    BOOST_CHECK_EQUAL(Parse("-noincludeconf"), "");
+    BOOST_CHECK_EQUAL(Parse("-includeconf"), "-includeconf cannot be used from commandline; -includeconf=\"\"");
+    BOOST_CHECK_EQUAL(Parse("-includeconf=file"), "-includeconf cannot be used from commandline; -includeconf=\"file\"");
+}
+
 BOOST_AUTO_TEST_CASE(util_ParseParameters)
 {
     TestArgsManager testArgs;
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -324,11 +324,14 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
         m_settings.command_line_options[key].push_back(value);
     }
 
-    // we do not allow -includeconf from command line
+    // we do not allow -includeconf from command line, only -noincludeconf
     if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {
-        const auto& include{*util::SettingsSpan(*includes).begin()}; // pick first value as example
-        error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();
-        return false;
+        const util::SettingsSpan values{*includes};
+        // Range may be empty if -noincludeconf was passed
+        if (!values.empty()) {
+            error = "-includeconf cannot be used from commandline; -includeconf=" + values.begin()->write();
+            return false; // pick first value as example
+        }
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -324,11 +324,14 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin`
`324`	`324`	`m_settings.command_line_options[key].push_back(value);`
`325`	`325`	`}`
`326`	`326`
`327`		`- // we do not allow -includeconf from command line`
	`327`	`+ // we do not allow -includeconf from command line, only -noincludeconf`
`328`	`328`	`if (auto* includes = util::FindKey(m_settings.command_line_options, "includeconf")) {`
`329`		`- const auto& include{util::SettingsSpan(includes).begin()}; // pick first value as example`
`330`		`- error = "-includeconf cannot be used from commandline; -includeconf=" + include.write();`
`331`		`- return false;`
	`329`	`+ const util::SettingsSpan values{*includes};`
	`330`	`+ // Range may be empty if -noincludeconf was passed`
	`331`	`+ if (!values.empty()) {`
	`332`	`+ error = "-includeconf cannot be used from commandline; -includeconf=" + values.begin()->write();`
	`333`	`+ return false; // pick first value as example`
	`334`	`+ }`
`332`	`335`	`}`
`333`	`336`	`return true;`
`334`	`337`	`}`