From: Dmitry Volyntsev Date: Wed, 18 Nov 2026 01:16:59 +0000 (-0800) Subject: WebCrypto: validate the export format when wrapping a key X-Git-Url: https://git.kaiwu.me/http/%7B@url%7D?a=commitdiff_plain;h=66f3558db5e547ab2435c08e6148601ce3148779;p=njs.git WebCrypto: validate the export format when wrapping a key wrapKey() uses the same serializer as exportKey(), but it bypasses its format check. This can route a key to a serializer that expects a different native key representation. Check the format in the shared export path before dispatching to a serializer. The issue was introduced in f42b2683 (0.9.7). --- diff --git a/external/njs_webcrypto_module.c b/external/njs_webcrypto_module.c index 35393165..7b9e85a7 100644 --- a/external/njs_webcrypto_module.c +++ b/external/njs_webcrypto_module.c @@ -2796,18 +2796,6 @@ njs_ext_export_key(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, goto fail; } - if (njs_slow_path(!(fmt & key->alg->fmt))) { - njs_vm_type_error(vm, "unsupported key fmt \"%V\" for \"%V\" key", - njs_format_string(fmt), - njs_algorithm_string(key->alg)); - goto fail; - } - - if (njs_slow_path(!key->extractable)) { - njs_vm_type_error(vm, "provided key cannot be extracted"); - goto fail; - } - ret = njs_webcrypto_export_key_raw(vm, key, fmt, njs_value_arg(&value)); if (njs_slow_path(ret != NJS_OK)) { goto fail; @@ -5021,6 +5009,18 @@ njs_webcrypto_export_key_raw(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_int_t ret; PKCS8_PRIV_KEY_INFO *pkcs8; + if (njs_slow_path(!(fmt & key->alg->fmt))) { + njs_vm_type_error(vm, "unsupported key fmt \"%V\" for \"%V\" key", + njs_format_string(fmt), + njs_algorithm_string(key->alg)); + return NJS_ERROR; + } + + if (njs_slow_path(!key->extractable)) { + njs_vm_type_error(vm, "provided key cannot be extracted"); + return NJS_ERROR; + } + switch (fmt) { case NJS_KEY_FORMAT_JWK: switch (key->alg->type) { diff --git a/external/qjs_webcrypto_module.c b/external/qjs_webcrypto_module.c index 16f5dd8a..102197ea 100644 --- a/external/qjs_webcrypto_module.c +++ b/external/qjs_webcrypto_module.c @@ -2648,6 +2648,18 @@ qjs_webcrypto_export_key_raw(JSContext *cx, qjs_webcrypto_key_t *key, JSValue ret; PKCS8_PRIV_KEY_INFO *pkcs8; + if (!(fmt & key->alg->fmt)) { + JS_ThrowTypeError(cx, "unsupported key fmt \"%s\" for \"%s\" key", + qjs_format_string(fmt), + qjs_algorithm_string(key->alg)); + return JS_EXCEPTION; + } + + if (!key->extractable) { + JS_ThrowTypeError(cx, "provided key cannot be extracted"); + return JS_EXCEPTION; + } + switch (fmt) { case QJS_KEY_FORMAT_JWK: switch (key->alg->type) { @@ -2826,18 +2838,6 @@ qjs_webcrypto_export_key(JSContext *cx, JSValueConst this_val, int argc, return JS_EXCEPTION; } - if (!(fmt & key->alg->fmt)) { - JS_ThrowTypeError(cx, "unsupported key fmt \"%s\" for \"%s\" key", - qjs_format_string(fmt), - qjs_algorithm_string(key->alg)); - return JS_EXCEPTION; - } - - if (!key->extractable) { - JS_ThrowTypeError(cx, "provided key cannot be extracted"); - return JS_EXCEPTION; - } - return qjs_webcrypto_export_key_raw(cx, key, fmt); } diff --git a/test/webcrypto/key_format.t.mjs b/test/webcrypto/key_format.t.mjs index a191f183..27b631f6 100644 --- a/test/webcrypto/key_format.t.mjs +++ b/test/webcrypto/key_format.t.mjs @@ -19,7 +19,8 @@ async function test(params) { break; case 'wrapKey': - await crypto.subtle.wrapKey('JWK', key, wrapping_key, 'AES-KW'); + await crypto.subtle.wrapKey(params.format || 'JWK', key, + wrapping_key, 'AES-KW'); break; default: @@ -33,6 +34,10 @@ async function test(params) { } } catch (e) { + if (params.format) { + return 'SUCCESS'; + } + if (!(e instanceof TypeError) || !e.message.includes('JWK')) { throw Error(`unexpected ${params.op} error: ${e}`); } @@ -40,17 +45,18 @@ async function test(params) { return 'SUCCESS'; } - throw Error(`${params.op} accepted unknown key format`); + throw Error(`${params.op} accepted invalid key format`); } let key_format_tsuite = { - name: 'unknown key format', + name: 'invalid key format', skip: async () => !await has_webcrypto_algorithm('AES-KW', 128), T: test, tests: [ {op: 'exportKey'}, {op: 'wrapKey'}, {op: 'unwrapKey'}, + {op: 'wrapKey', format: 'pkcs8'}, ], };