authtool: Enhance argument combinations validation #9704
Merged
Conversation
This file contains 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
|
make[5]: *** Deleting file `test/cephtool-test-mds.sh.log' Known issue. |
| @@ -86,6 +86,10 @@ int main(int argc, const char **argv) | |||
| } else if (ceph_argparse_flag(args, i, "--gen-print-key", (char*)NULL)) { | |||
| gen_print_key = true; | |||
| } else if (ceph_argparse_witharg(args, i, &val, "-a", "--add-key", (char*)NULL)) { | |||
| if (val.empty()) { | |||
| cerr << "Option --add-key requires an argument" << std::endl; | |||
There was a problem hiding this comment.
maybe "an non-empty argument".
There was a problem hiding this comment.
Well, this matches an existing error message from ceph_argparse for consistency.
|
|
||
| Test --add-key with empty argument | ||
|
|
||
| $ /home/brad/working/src/ceph/src/ceph-authtool kring -C --name=mon.* --add-key= --cap mon 'allow *' |
There was a problem hiding this comment.
might want to use a path also applies under other circumstances.
|
OOPs! Sure, let me fix that... |
badone
force-pushed
the
wip-ceph-authtool-fixes
branch
from
f567e17
to
fa246a8
Compare
Under certain circumstances ceph-authtool can create invalid key entries in the specified keyring and behave less than intuitively. What's worse these keys can currently cause ceph daemons to crash. This patch attempts to tighten the behaviour and eliminate the possibility an invalid key can be created. Fixes: http://tracker.ceph.com/issues/2904 Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
badone
force-pushed
the
wip-ceph-authtool-fixes
branch
from
fa246a8
to
d15ad96
Compare
|
lgtm, and tested locally, will merge once jenkins finishes. |
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.
Under certain circumstances ceph-authtool can create invalid key entries in
the specified keyring and behave less than intuitively. What's worse these
keys can currently cause ceph daemons to crash. This patch attempts to tighten
the behaviour and eliminate the possibility an invalid key can be created.
http://tracker.ceph.com/issues/2904
Fixes: #2904
Signed-off-by: Brad Hubbard bhubbard@redhat.com