Improve error message for invalid consenter cert #2587
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
orderer/consensus/etcdraft/util.go
Outdated
| @@ -247,7 +247,7 @@ func VerifyConfigMetadata(metadata *etcdraft.ConfigMetadata, verifyOpts x509.Ver | |||
| return errors.Errorf("metadata has nil consenter") | |||
| } | |||
| if err := validateConsenterTLSCerts(consenter, verifyOpts, true); err != nil { | |||
| return err | |||
| return errors.Wrapf(err, "consenter %s:%d has invalid certificate", consenter.Host, consenter.Port) | |||
There was a problem hiding this comment.
errors.WithMessagef would be a better choice, as the underlying error is generated by the fabric code.
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
denyeart
force-pushed
the
improve_consenter_cert_err
branch
from
f0a5b5b
to
583270a
Compare
lindluni
approved these changes
May 13, 2021
|
@Mergifyio backport release-2.3 |
|
@Mergifyio backport release-2.2 |
mergify bot
pushed a commit
that referenced
this pull request
May 14, 2021
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com> (cherry picked from commit dbf7eb1)
|
Command
|
mergify bot
pushed a commit
that referenced
this pull request
May 14, 2021
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com> (cherry picked from commit dbf7eb1)
|
Command
|
denyeart
added a commit
that referenced
this pull request
May 14, 2021
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com> (cherry picked from commit dbf7eb1)
denyeart
added a commit
that referenced
this pull request
May 14, 2021
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com> (cherry picked from commit dbf7eb1)
C0rWin
pushed a commit
to C0rWin/fabric
that referenced
this pull request
Sep 24, 2022
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified. The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid. Signed-off-by: David Enyeart <enyeart@us.ibm.com> (cherry picked from commit dbf7eb1)
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.
When channel config had an invalid consenter cert, the error message did not indicate which cert was being verified.
The error message now indicates that a consenter cert is invalid, and which consenter cert is invalid.
Signed-off-by: David Enyeart enyeart@us.ibm.com