-
-
Notifications
You must be signed in to change notification settings - Fork 35.1k
crypto: add crypto::GetSSLCtx API for addon access to OpenSSL contexts #62254
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.
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
Open
pimterry
wants to merge
2
commits into
nodejs:main
Choose a base branch
from
pimterry:getsslctx-api
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+171
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #include <node.h> | ||
| #include <openssl/ssl.h> | ||
addaleax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| namespace { | ||
|
|
||
| // Test: extract SSL_CTX* from a SecureContext object via | ||
| // node::crypto::GetSSLCtx. | ||
| void GetSSLCtx(const v8::FunctionCallbackInfo<v8::Value>& args) { | ||
| v8::Isolate* isolate = args.GetIsolate(); | ||
| v8::Local<v8::Context> context = isolate->GetCurrentContext(); | ||
|
|
||
| SSL_CTX* ctx = node::crypto::GetSSLCtx(context, args[0]); | ||
| if (ctx == nullptr) { | ||
| isolate->ThrowException(v8::Exception::Error( | ||
| v8::String::NewFromUtf8( | ||
| isolate, "GetSSLCtx returned nullptr for a valid SecureContext") | ||
| .ToLocalChecked())); | ||
| return; | ||
| } | ||
|
|
||
| // Verify the pointer is a valid SSL_CTX by calling an OpenSSL function. | ||
| const SSL_METHOD* method = SSL_CTX_get_ssl_method(ctx); | ||
| if (method == nullptr) { | ||
| isolate->ThrowException(v8::Exception::Error( | ||
| v8::String::NewFromUtf8(isolate, | ||
| "SSL_CTX_get_ssl_method returned nullptr") | ||
| .ToLocalChecked())); | ||
| return; | ||
| } | ||
|
|
||
| args.GetReturnValue().Set(true); | ||
| } | ||
|
|
||
| // Test: passing a non-SecureContext value returns nullptr. | ||
| void GetSSLCtxInvalid(const v8::FunctionCallbackInfo<v8::Value>& args) { | ||
| v8::Isolate* isolate = args.GetIsolate(); | ||
| v8::Local<v8::Context> context = isolate->GetCurrentContext(); | ||
|
|
||
| SSL_CTX* ctx = node::crypto::GetSSLCtx(context, args[0]); | ||
| args.GetReturnValue().Set(ctx == nullptr); | ||
| } | ||
|
|
||
| void Initialize(v8::Local<v8::Object> exports, | ||
| v8::Local<v8::Value> module, | ||
| v8::Local<v8::Context> context) { | ||
| NODE_SET_METHOD(exports, "getSSLCtx", GetSSLCtx); | ||
| NODE_SET_METHOD(exports, "getSSLCtxInvalid", GetSSLCtxInvalid); | ||
| } | ||
|
|
||
| } // anonymous namespace | ||
|
|
||
| NODE_MODULE_CONTEXT_AWARE(NODE_GYP_MODULE_NAME, Initialize) | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| 'targets': [ | ||
| { | ||
| 'target_name': 'binding', | ||
| 'includes': ['../common.gypi'], | ||
| 'conditions': [ | ||
| ['node_use_openssl=="true"', { | ||
| 'conditions': [ | ||
| ['OS in "aix os400"', { | ||
| 'variables': { | ||
| # Used to differentiate `AIX` and `OS400`(IBM i). | ||
| 'aix_variant_name': '<!(uname -s)', | ||
| }, | ||
| 'conditions': [ | ||
| [ '"<(aix_variant_name)"!="OS400"', { # Not `OS400`(IBM i) | ||
| 'sources': ['binding.cc'], | ||
| 'include_dirs': ['../../../deps/openssl/openssl/include'], | ||
| }], | ||
| ], | ||
| }, { | ||
| 'sources': ['binding.cc'], | ||
| 'include_dirs': ['../../../deps/openssl/openssl/include'], | ||
| }], | ||
| ], | ||
| }], | ||
| ], | ||
| }, | ||
| ], | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| 'use strict'; | ||
| const common = require('../../common'); | ||
| if (!common.hasCrypto) | ||
| common.skip('missing crypto'); | ||
|
|
||
| const assert = require('assert'); | ||
| const tls = require('tls'); | ||
| const binding = require(`./build/${common.buildType}/binding`); | ||
|
|
||
| // Test 1: Pass a SecureContext to getSSLCtx. | ||
| { | ||
| const ctx = tls.createSecureContext(); | ||
| assert.strictEqual(binding.getSSLCtx(ctx), true); | ||
| } | ||
|
|
||
| // Test 2: Passing a non-SecureContext should return nullptr. | ||
| { | ||
| assert.strictEqual(binding.getSSLCtxInvalid({}), true); | ||
| } | ||
|
|
||
| // Test 3: Passing a number should return nullptr. | ||
| { | ||
| assert.strictEqual(binding.getSSLCtxInvalid(42), true); | ||
| } | ||
|
|
||
| // Test 4: Passing undefined should return nullptr. | ||
| { | ||
| assert.strictEqual(binding.getSSLCtxInvalid(undefined), true); | ||
| } | ||
|
|
||
| // Test 5: Passing null should return nullptr. | ||
| { | ||
| assert.strictEqual(binding.getSSLCtxInvalid(null), true); | ||
| } | ||
|
|
||
| // Test 6: An object with a non-SecureContext .context property should return | ||
| // nullptr. | ||
| { | ||
| assert.strictEqual(binding.getSSLCtxInvalid({ context: 'not a context' }), true); | ||
| } | ||
|
|
||
| // Test 7: An object with a throwing .context getter should return nullptr | ||
| // without propagating the exception. | ||
| { | ||
| const obj = { | ||
| get context() { throw new Error('getter threw'); }, | ||
| }; | ||
| assert.strictEqual(binding.getSSLCtxInvalid(obj), true); | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.