mirror of
https://github.com/nodejs/node.git
synced 2026-11-09 15:11:11 -05:00
crypto: add crypto::GetSSLCtx API for addon access to OpenSSL contexts
This intended to replace usage of the unsupported _external field, offering an official API for native addons to access OpenSSL directly while reducing the JS API and internal field exposure. PR-URL: https://github.com/nodejs/node/pull/62254 Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
1 parent
d11fbc3602
commit
f417abd4e4
6 files changed
+172
No files matched your search
@@ -2379,5 +2379,30 @@ void UseExtraCaCerts(const std::string& file) {
|
||||
extra_root_certs_file = file;
|
||||
}
|
||||
|
||||
NODE_EXTERN SSL_CTX* GetSSLCtx(Local<Context> context, Local<Value> value) {
|
||||
Environment* env = Environment::GetCurrent(context);
|
||||
if (env == nullptr) return nullptr;
|
||||
|
||||
// TryCatchto swallow any exceptions from Get() (e.g. failing getters)
|
||||
v8::TryCatch try_catch(env->isolate());
|
||||
|
||||
// Unwrap the .context property from the JS SecureContext wrapper
|
||||
// (as returned by tls.createSecureContext()).
|
||||
if (value->IsObject()) {
|
||||
Local<Value> inner;
|
||||
if (!value.As<v8::Object>()
|
||||
->Get(context, FIXED_ONE_BYTE_STRING(env->isolate(), "context"))
|
||||
.ToLocal(&inner)) {
|
||||
return nullptr;
|
||||
}
|
||||
value = inner;
|
||||
}
|
||||
|
||||
if (!SecureContext::HasInstance(env, value)) return nullptr;
|
||||
SecureContext* sc = BaseObject::FromJSObject<SecureContext>(value);
|
||||
if (sc == nullptr) return nullptr;
|
||||
return sc->ctx().get();
|
||||
}
|
||||
|
||||
} // namespace crypto
|
||||
} // namespace node
|
||||
+16
@@ -124,6 +124,8 @@
|
||||
|
||||
// Forward-declare libuv loop
|
||||
struct uv_loop_s;
|
||||
struct napi_module;
|
||||
struct ssl_ctx_st; // Forward declaration of SSL_CTX for OpenSSL.
|
||||
|
||||
// Forward-declare these functions now to stop MSVS from becoming
|
||||
// terminally confused when it's done in node_internals.h
|
||||
@@ -1596,6 +1598,20 @@ NODE_EXTERN void SetCppgcReference(v8::Isolate* isolate,
|
||||
v8::Local<v8::Object> object,
|
||||
void* wrappable);
|
||||
|
||||
namespace crypto {
|
||||
|
||||
// Returns the SSL_CTX* from a SecureContext JS object, as returned by
|
||||
// tls.createSecureContext().
|
||||
// Returns nullptr if the value is not a SecureContext instance,
|
||||
// or if Node.js was built without OpenSSL.
|
||||
//
|
||||
// The returned pointer is not owned by the caller and must not be freed.
|
||||
// It is valid only while the SecureContext JS object remains alive.
|
||||
NODE_EXTERN struct ssl_ctx_st* GetSSLCtx(v8::Local<v8::Context> context,
|
||||
v8::Local<v8::Value> secure_context);
|
||||
|
||||
} // namespace crypto
|
||||
|
||||
} // namespace node
|
||||
|
||||
#endif // SRC_NODE_H_
|
||||
@@ -12,6 +12,7 @@ openssl-binding/test: PASS,FLAKY
|
||||
|
||||
[$system==ibmi]
|
||||
openssl-binding/test: SKIP
|
||||
openssl-get-ssl-ctx/test: SKIP
|
||||
openssl-providers/test-default-only-config: SKIP
|
||||
openssl-providers/test-legacy-provider-config: SKIP
|
||||
openssl-providers/test-legacy-provider-inactive-config: SKIP
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
#include <node.h>
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
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)
|
||||
@@ -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'],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
],
|
||||
},
|
||||
],
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
Reference in new issue
Block a user