crypto: migrate Certificate to internal/errors
Move argument type checking to js, use internal/errors PR-URL: https://github.com/nodejs/node/pull/15756 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
parent
abbdcaa6e8
commit
3ddc88b5c2
@ -64,11 +64,12 @@ console.log(challenge.toString('utf8'));
|
|||||||
// Prints: the challenge as a UTF8 string
|
// Prints: the challenge as a UTF8 string
|
||||||
```
|
```
|
||||||
|
|
||||||
### Certificate.exportPublicKey(spkac)
|
### Certificate.exportPublicKey(spkac[, encoding])
|
||||||
<!-- YAML
|
<!-- YAML
|
||||||
added: REPLACEME
|
added: REPLACEME
|
||||||
-->
|
-->
|
||||||
- `spkac` {string | Buffer | TypedArray | DataView}
|
- `spkac` {string | Buffer | TypedArray | DataView}
|
||||||
|
- `encoding` {string}
|
||||||
- Returns {Buffer} The public key component of the `spkac` data structure,
|
- Returns {Buffer} The public key component of the `spkac` data structure,
|
||||||
which includes a public key and a challenge.
|
which includes a public key and a challenge.
|
||||||
|
|
||||||
|
@ -6,20 +6,37 @@ const {
|
|||||||
certVerifySpkac
|
certVerifySpkac
|
||||||
} = process.binding('crypto');
|
} = process.binding('crypto');
|
||||||
|
|
||||||
|
const errors = require('internal/errors');
|
||||||
|
const { isArrayBufferView } = require('internal/util/types');
|
||||||
|
|
||||||
const {
|
const {
|
||||||
toBuf
|
toBuf
|
||||||
} = require('internal/crypto/util');
|
} = require('internal/crypto/util');
|
||||||
|
|
||||||
function verifySpkac(object) {
|
function verifySpkac(spkac) {
|
||||||
return certVerifySpkac(object);
|
if (!isArrayBufferView(spkac)) {
|
||||||
|
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'spkac',
|
||||||
|
['Buffer', 'TypedArray', 'DataView']);
|
||||||
|
}
|
||||||
|
return certVerifySpkac(spkac);
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportPublicKey(object, encoding) {
|
function exportPublicKey(spkac, encoding) {
|
||||||
return certExportPublicKey(toBuf(object, encoding));
|
spkac = toBuf(spkac, encoding);
|
||||||
|
if (!isArrayBufferView(spkac)) {
|
||||||
|
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'spkac',
|
||||||
|
['string', 'Buffer', 'TypedArray', 'DataView']);
|
||||||
|
}
|
||||||
|
return certExportPublicKey(spkac);
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportChallenge(object, encoding) {
|
function exportChallenge(spkac, encoding) {
|
||||||
return certExportChallenge(toBuf(object, encoding));
|
spkac = toBuf(spkac, encoding);
|
||||||
|
if (!isArrayBufferView(spkac)) {
|
||||||
|
throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'spkac',
|
||||||
|
['string', 'Buffer', 'TypedArray', 'DataView']);
|
||||||
|
}
|
||||||
|
return certExportChallenge(spkac);
|
||||||
}
|
}
|
||||||
|
|
||||||
// For backwards compatibility reasons, this cannot be converted into a
|
// For backwards compatibility reasons, this cannot be converted into a
|
||||||
|
@ -5816,14 +5816,8 @@ bool VerifySpkac(const char* data, unsigned int len) {
|
|||||||
|
|
||||||
|
|
||||||
void VerifySpkac(const FunctionCallbackInfo<Value>& args) {
|
void VerifySpkac(const FunctionCallbackInfo<Value>& args) {
|
||||||
Environment* env = Environment::GetCurrent(args);
|
|
||||||
bool i = false;
|
bool i = false;
|
||||||
|
|
||||||
if (args.Length() < 1)
|
|
||||||
return env->ThrowTypeError("Data argument is mandatory");
|
|
||||||
|
|
||||||
THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "Data");
|
|
||||||
|
|
||||||
size_t length = Buffer::Length(args[0]);
|
size_t length = Buffer::Length(args[0]);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
return args.GetReturnValue().Set(i);
|
return args.GetReturnValue().Set(i);
|
||||||
@ -5881,11 +5875,6 @@ char* ExportPublicKey(const char* data, int len, size_t* size) {
|
|||||||
void ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
|
void ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
|
||||||
Environment* env = Environment::GetCurrent(args);
|
Environment* env = Environment::GetCurrent(args);
|
||||||
|
|
||||||
if (args.Length() < 1)
|
|
||||||
return env->ThrowTypeError("Public key argument is mandatory");
|
|
||||||
|
|
||||||
THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "Public key");
|
|
||||||
|
|
||||||
size_t length = Buffer::Length(args[0]);
|
size_t length = Buffer::Length(args[0]);
|
||||||
if (length == 0)
|
if (length == 0)
|
||||||
return args.GetReturnValue().SetEmptyString();
|
return args.GetReturnValue().SetEmptyString();
|
||||||
@ -5922,11 +5911,6 @@ const char* ExportChallenge(const char* data, int len) {
|
|||||||
void ExportChallenge(const FunctionCallbackInfo<Value>& args) {
|
void ExportChallenge(const FunctionCallbackInfo<Value>& args) {
|
||||||
Environment* env = Environment::GetCurrent(args);
|
Environment* env = Environment::GetCurrent(args);
|
||||||
|
|
||||||
if (args.Length() < 1)
|
|
||||||
return env->ThrowTypeError("Challenge argument is mandatory");
|
|
||||||
|
|
||||||
THROW_AND_RETURN_IF_NOT_BUFFER(args[0], "Challenge");
|
|
||||||
|
|
||||||
size_t len = Buffer::Length(args[0]);
|
size_t len = Buffer::Length(args[0]);
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
return args.GetReturnValue().SetEmptyString();
|
return args.GetReturnValue().SetEmptyString();
|
||||||
|
@ -80,3 +80,37 @@ function stripLineEndings(obj) {
|
|||||||
|
|
||||||
// direct call Certificate() should return instance
|
// direct call Certificate() should return instance
|
||||||
assert(Certificate() instanceof Certificate);
|
assert(Certificate() instanceof Certificate);
|
||||||
|
|
||||||
|
[1, {}, [], Infinity, true, 'test', undefined, null].forEach((i) => {
|
||||||
|
common.expectsError(
|
||||||
|
() => Certificate.verifySpkac(i),
|
||||||
|
{
|
||||||
|
code: 'ERR_INVALID_ARG_TYPE',
|
||||||
|
type: TypeError,
|
||||||
|
message: 'The "spkac" argument must be one of type Buffer, TypedArray, ' +
|
||||||
|
'or DataView'
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
[1, {}, [], Infinity, true, undefined, null].forEach((i) => {
|
||||||
|
common.expectsError(
|
||||||
|
() => Certificate.exportPublicKey(i),
|
||||||
|
{
|
||||||
|
code: 'ERR_INVALID_ARG_TYPE',
|
||||||
|
type: TypeError,
|
||||||
|
message: 'The "spkac" argument must be one of type string, Buffer,' +
|
||||||
|
' TypedArray, or DataView'
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
common.expectsError(
|
||||||
|
() => Certificate.exportChallenge(i),
|
||||||
|
{
|
||||||
|
code: 'ERR_INVALID_ARG_TYPE',
|
||||||
|
type: TypeError,
|
||||||
|
message: 'The "spkac" argument must be one of type string, Buffer,' +
|
||||||
|
' TypedArray, or DataView'
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user