Skip to content

src: assign error codes to more errors thrown in C++ #20121

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.

Sign up for GitHub

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

Closed
joyeecheung wants to merge 10 commits into from
Closed

src: assign error codes to more errors thrown in C++ #20121

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
034ddaf
src: add THROW_ERR_* helpers
joyeecheung Apr 16, 2018
495ba98
src: migrate ERR_INDEX_OUT_OF_RANGE in C++
joyeecheung Apr 16, 2018
0a9f327
src: throw ERR_INVALID_ARG_TYPE in C++ argument checks
joyeecheung Apr 16, 2018
185c60d
src: throw ERR_BUFFER_OUT_OF_BOUNDS in node_buffer.cc
joyeecheung Apr 16, 2018
b2e7ff3
src: throw ERR_MISSING_MODULE in module_wrap.cc
joyeecheung Apr 16, 2018
46935ab
src: throw ERR_INVALID_ARG_VALUE in node_crypto.cc
joyeecheung Apr 18, 2018
0b4364e
src: throw ERR_MISSING_ARGS in node_crypto.cc
joyeecheung Apr 18, 2018
184e8ea
fixup! src: throw ERR_MISSING_ARGS in node_crypto.cc
joyeecheung Apr 18, 2018
834764e
fixup! src: throw ERR_INVALID_ARG_TYPE in C++ argument checks
joyeecheung Apr 18, 2018
60a0c36
fixup! src: throw ERR_INVALID_ARG_VALUE in node_crypto.cc
joyeecheung Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! src: throw ERR_MISSING_ARGS in node_crypto.cc
  • Loading branch information
@joyeecheung
joyeecheung committed Apr 18, 2018
commit 184e8eaa24944ef4794e2648f330d7f597f606a4
38 changes: 15 additions & 23 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,7 @@ void SecureContext::SetKey(const FunctionCallbackInfo<Value>& args) {

unsigned int len = args.Length();
if (len < 1) {
return node::THROW_ERR_MISSING_ARGS(env,
"Private key argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Private key argument is mandatory");
}

if (len > 2) {
Expand Down Expand Up @@ -693,8 +692,7 @@ void SecureContext::SetCert(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&sc, args.Holder());

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(env,
"Certificate argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Certificate argument is mandatory");
}

BIO* bio = LoadBIO(env, args[0]);
Expand Down Expand Up @@ -768,8 +766,7 @@ void SecureContext::AddCACert(const FunctionCallbackInfo<Value>& args) {
ClearErrorOnReturn clear_error_on_return;

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(env,
"CA certificate argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "CA certificate argument is mandatory");
}

BIO* bio = LoadBIO(env, args[0]);
Expand Down Expand Up @@ -800,7 +797,7 @@ void SecureContext::AddCRL(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&sc, args.Holder());

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(env, "CRL argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "CRL argument is mandatory");
}

ClearErrorOnReturn clear_error_on_return;
Expand Down Expand Up @@ -903,7 +900,7 @@ void SecureContext::SetCiphers(const FunctionCallbackInfo<Value>& args) {
ClearErrorOnReturn clear_error_on_return;

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(env, "Ciphers argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Ciphers argument is mandatory");
}

THROW_AND_RETURN_IF_NOT_STRING(env, args[0], "Ciphers");
Expand All @@ -919,8 +916,7 @@ void SecureContext::SetECDHCurve(const FunctionCallbackInfo<Value>& args) {
Environment* env = sc->env();

if (args.Length() != 1)
return node::THROW_ERR_MISSING_ARGS(
env, "ECDH curve name argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "ECDH curve name argument is mandatory");

THROW_AND_RETURN_IF_NOT_STRING(env, args[0], "ECDH curve name");

Expand All @@ -943,7 +939,7 @@ void SecureContext::SetDHParam(const FunctionCallbackInfo<Value>& args) {
// Auto DH is not supported in openssl 1.0.1, so dhparam needs
// to be specified explicitly
if (args.Length() != 1)
return node::THROW_ERR_MISSING_ARGS(env, "DH argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "DH argument is mandatory");

// Invalid dhparam is silently discarded and DHE is no longer used.
BIO* bio = LoadBIO(env, args[0]);
Expand Down Expand Up @@ -998,7 +994,7 @@ void SecureContext::SetSessionIdContext(
Environment* env = sc->env();

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(
return THROW_ERR_MISSING_ARGS(
env, "Session ID context argument is mandatory");
}

Expand Down Expand Up @@ -1070,8 +1066,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo<Value>& args) {
ClearErrorOnReturn clear_error_on_return;

if (args.Length() < 1) {
return node::THROW_ERR_MISSING_ARGS(
env, "PFX certificate argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "PFX certificate argument is mandatory");
}

in = LoadBIO(env, args[0]);
Expand Down Expand Up @@ -1204,8 +1199,7 @@ void SecureContext::SetTicketKeys(const FunctionCallbackInfo<Value>& args) {
Environment* env = wrap->env();

if (args.Length() < 1) {
return node::THROW_ERR_MISSING_ARGS(
env, "Ticket keys argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Ticket keys argument is mandatory");
}

THROW_AND_RETURN_IF_NOT_BUFFER(env, args[0], "Ticket keys");
Expand Down Expand Up @@ -1958,7 +1952,7 @@ void SSLWrap<Base>::SetSession(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());

if (args.Length() < 1) {
return node::THROW_ERR_MISSING_ARGS(env, "Session argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Session argument is mandatory");
}

THROW_AND_RETURN_IF_NOT_BUFFER(env, args[0], "Session");
Expand Down Expand Up @@ -2083,8 +2077,7 @@ void SSLWrap<Base>::SetOCSPResponse(
Environment* env = w->env();

if (args.Length() < 1)
return node::THROW_ERR_MISSING_ARGS(
env, "OCSP response argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "OCSP response argument is mandatory");

THROW_AND_RETURN_IF_NOT_BUFFER(env, args[0], "OCSP response");

Expand Down Expand Up @@ -4092,8 +4085,7 @@ void DiffieHellman::DiffieHellmanGroup(
DiffieHellman* diffieHellman = new DiffieHellman(env, args.This());

if (args.Length() != 1) {
return node::THROW_ERR_MISSING_ARGS(
env, "Group name argument is mandatory");
return THROW_ERR_MISSING_ARGS(env, "Group name argument is mandatory");
}

THROW_AND_RETURN_IF_NOT_STRING(env, args[0], "Group name");
Expand Down Expand Up @@ -4243,7 +4235,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
BIGNUM* key = nullptr;

if (args.Length() == 0) {
return node::THROW_ERR_MISSING_ARGS(
return THROW_ERR_MISSING_ARGS(
env, "Other party's public key argument is mandatory");
} else {
THROW_AND_RETURN_IF_NOT_BUFFER(env, args[0], "Other party's public key");
Expand Down Expand Up @@ -4314,7 +4306,7 @@ void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<v8::Value>& args,

if (args.Length() == 0) {
snprintf(errmsg, sizeof(errmsg), "%s argument is mandatory", what);
return node::THROW_ERR_MISSING_ARGS(env, errmsg);
return THROW_ERR_MISSING_ARGS(env, errmsg);
}

if (!Buffer::HasInstance(args[0])) {
Expand Down