Resolve config files with less spaghet#91
Open
TheToddLuci0 wants to merge 2 commits intoknavesec:masterfrom
Open
Resolve config files with less spaghet#91TheToddLuci0 wants to merge 2 commits intoknavesec:masterfrom
TheToddLuci0 wants to merge 2 commits intoknavesec:masterfrom
Conversation
Contributor
Author
|
A quick PoC to show the precedence order still works. (note that a debug print was added just before instantiating the (venv) ┌──(venv)─(kali㉿kali)-[~/git/CredMaster]
└─$ tail credmaster.py -n 3
# Debug print for demo
print(f"Current profile: {args.profile_name}")
CredMaster(args, pluginargs)
(venv) ┌──(venv)─(kali㉿kali)-[~/git/CredMaster]
└─$ python3 credmaster.py --plugin template 2>/dev/null | grep "Current profile"
Current profile: None
(venv) ┌──(venv)─(kali㉿kali)-[~/git/CredMaster]
└─$ python3 credmaster.py --plugin template --config aws.config 2>/dev/null | grep "Current profile"
Current profile: credmaster
(venv) ┌──(venv)─(kali㉿kali)-[~/git/CredMaster]
└─$ python3 credmaster.py --plugin template --config aws.config --profile testey_mc_testerson 2>/dev/null | grep "Current profile"
Current profile: testey_mc_testerson
The |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While hunting another issue, the spaghetti that is options resolution was getting rather annoying. So I replaced it with something much less tasty, but also much cleaner.
Basically, it uses the
ArgumentParser.set_defaultsmethod to update the defaults with the config files at runtime. This manes that we get the same behavior of "CLI wins", while also reducing the need to manually update aself.foobar = args.foobar or config_dict.get("foobar")every time a change is made to the args.The downside is that it calls
parser.parse_known_args()twice, but the actual runtime difference is, as far as I can measure, zero. Might matter if anyone is running credmaster on a 3DS.