crypto, errors: Add CryptoError to internal/errors, update crypto.setEngine #16529
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
jasnell
added
crypto
nodejs-github-bot
added
c++
|
Ping @nodejs/tsc |
jasnell
changed the title
|
Test is failing on windows... fixing now |
joyeecheung
reviewed
Oct 28, 2017
test/parallel/test-crypto-engine.js
Outdated
| assert(err.info, 'does not have info property'); | ||
| assert(Array.isArray(err.opensslErrorStack), | ||
| 'opensslErrorStack must be an array'); | ||
| assert(typeof err.info.code, 'number'); |
There was a problem hiding this comment.
assert.strictEqual(), and the line below
4 tasks
|
I'd like this to land after #16567 |
Allows setting an `additional` callback to perform additional checks on the given error object
A new internal/errors type that provides access to the `opensslErrorStack`, code, and message.
Update the `crypto.setEngine()` method to use the new internal/errors `CryptoError` mechanism rather than using `throwCryptoError()`
jasnell
force-pushed
the
internal-errors-crypto-error
branch
from
c654fda to
5fce91e
Compare
joyeecheung
approved these changes
Oct 30, 2017
| @@ -309,9 +288,65 @@ void ThrowCryptoError(Environment* env, | |||
| // 'error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib', | |||
| // 'error:0D07803A:asn1 encoding routines:ASN1_ITEM_EX_D2I:nested asn1 err' | |||
| // ] | |||
| exception->Set(env->context(), env->openssl_error_stack(), error_stack) | |||
| context->Set(env->context(), env->openssl_error_stack(), error_stack) | |||
There was a problem hiding this comment.
Would be easier to understand if the context argument here is named exception or error, I thought this is a v8::Context at first
There was a problem hiding this comment.
Also the one in CaptureCryptoStatus
There was a problem hiding this comment.
Once #16567 lands I'll be refactoring this one a bit. Will make that change then.
|
@targos ... yes, I'll get this updated this week. |
|
@jasnell there is not much time left this week ;-) |
|
Heh. True. Will still try to get to it. |
|
Ping @jasnell |
|
Yep, haven't forgotten. :-) |
|
@jasnell ping again ;-) |
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.
The way that
throwCryptoError()is currently defined withinsrc/node_crypto.ccmakes it rather difficult to refactor those errors to useinternal/errors. This provides an alternative and an example of it being used.There are three commits:
One that adds a new
additionalcallback check forcommon.expectsError()that provides the ability to perform additional checks on an errorOne that adds a new
errors.CryptoErrorto internal/errorsOne that finishing migrating the
crypto.setEngine()method to useerrors.CryptoError, illustrating how the revised mechanism for getting theopensslErrorStackandmessageproperties would work. The same pattern would be used for all instances ofthrowCryptoError()Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
crypto, errors