Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Add ALLOW_LIST flags and enforce usage in CheckArgFlags #17580

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
+1,111 −185
Draft

refactor: Add ALLOW_LIST flags and enforce usage in CheckArgFlags #17580

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
20a9986
common: Grammar / formatting tweaks
ryanofsky Sep 25, 2024
30385f2
doc: Add detailed ArgsManager type flag documention
ryanofsky Jul 30, 2024
a7a35ed
common: Implement ArgsManager flags to parse and validate settings on…
ryanofsky Aug 4, 2019
225ab2b
common: Update ArgManager GetArg helper methods to work better with A…
ryanofsky Sep 21, 2022
350c715
test: Add tests to demonstrate usage of ArgsManager flags
ryanofsky Jul 30, 2024
b5ef854
test: Add test for settings.json parsing with type flags
ryanofsky Jun 5, 2024
afaf226
Merge remote-tracking branch 'origin/pull/16545/head'
ryanofsky Dec 5, 2024
da3bdd5
common: Add support for combining ArgsManager flags
ryanofsky Aug 19, 2024
603423e
scripted-diff: Add ALLOW_LIST flag to arguments retrieved with GetArgs
ryanofsky Nov 15, 2019
8f6aa85
refactor: Fix more ALLOW_LIST arguments
ryanofsky Nov 15, 2019
7a75635
Always reject empty -blockfilterindex="" arguments
ryanofsky Sep 22, 2022
d2edef6
refactor: Always enforce ALLOW_LIST in CheckArgFlags
ryanofsky Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
common: Grammar / formatting tweaks 
Implement cleanup suggestions from l0rinc:

#16545 (comment)
#16545 (comment)
#16545 (comment)
  • Loading branch information
@ryanofsky
ryanofsky committed Sep 25, 2024
commit 20a9986751785d3047cfd87fa82c4b05a2e82b41
6 changes: 3 additions & 3 deletions src/common/args.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ KeyInfo InterpretKey(std::string key)
* @param[in] flags ArgsManager registered argument flags
* @param[out] error Error description if settings value is not valid
*
* @return parsed settings value if it is valid, otherwise nullopt accompanied
* @return parsed settings value if it is valid, otherwise `nullopt` accompanied
* by a descriptive error string
*/
std::optional<common::SettingsValue> InterpretValue(const KeyInfo& key, const std::string* value,
unsigned int flags, std::string& error)
unsigned int flags, std::string& error)
{
// Return negated settings as false values.
if (key.negated) {
Expand All @@ -121,7 +121,7 @@ std::optional<common::SettingsValue> InterpretValue(const KeyInfo& key, const st
return false;
}
if (!value && (flags & ArgsManager::DISALLOW_ELISION)) {
error = strprintf("Can not set -%s with no value. Please specify value with -%s=value.", key.name, key.name);
error = strprintf("Cannot set -%s with no value. Please specify value with -%s=value.", key.name, key.name);
return std::nullopt;
}
return value ? *value : "";
Expand Down
2 changes: 1 addition & 1 deletion test/functional/feature_config_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def test_config_file_log(self):

def test_invalid_command_line_options(self):
self.nodes[0].assert_start_raises_init_error(
expected_msg='Error: Error parsing command line arguments: Can not set -proxy with no value. Please specify value with -proxy=value.',
expected_msg='Error: Error parsing command line arguments: Cannot set -proxy with no value. Please specify value with -proxy=value.',
extra_args=['-proxy'],
)
# Provide a value different from 1 to the -wallet negated option
Expand Down