From: Dmitry Volyntsev Date: Tue, 17 Nov 2026 01:07:04 +0000 (-0800) Subject: WebCrypto: reject unknown key formats in QuickJS X-Git-Url: https://git.kaiwu.me/%7Bsubstring-before(@doc,%20'.xml')%7D.html?a=commitdiff_plain;h=6e721734fb1d7919be59245e3c429ec863aa070c;p=njs.git WebCrypto: reject unknown key formats in QuickJS Previously, exportKey(), wrapKey() and unwrapKey() ignored the QJS_KEY_FORMAT_UNKNOWN result of qjs_key_format() and kept the pending exception. exportKey() and unwrapKey() then replaced it with 'unsupported key fmt "(null)"', while wrapKey() fell back to the raw format and resolved, so wrapKey('JWK', ...) silently wrapped raw key bytes. Check the format like importKey() and the njs implementation do. The issue was introduced in 75ca26f8 (0.8.10) for exportKey() and in f42b2683 (0.9.7) for wrapKey() and unwrapKey(). --- diff --git a/external/qjs_webcrypto_module.c b/external/qjs_webcrypto_module.c index 684e84b3..97108232 100644 --- a/external/qjs_webcrypto_module.c +++ b/external/qjs_webcrypto_module.c @@ -2704,6 +2704,9 @@ qjs_webcrypto_export_key(JSContext *cx, JSValueConst this_val, int argc, qjs_webcrypto_key_format_t fmt; fmt = qjs_key_format(cx, argv[0]); + if (fmt == QJS_KEY_FORMAT_UNKNOWN) { + return JS_EXCEPTION; + } key = JS_GetOpaque2(cx, argv[1], QJS_CORE_CLASS_ID_WEBCRYPTO_KEY); if (key == NULL) { @@ -4991,6 +4994,9 @@ qjs_webcrypto_wrap_key(JSContext *cx, JSValueConst this_val, int argc, qjs_webcrypto_key_format_t fmt; fmt = qjs_key_format(cx, argv[0]); + if (fmt == QJS_KEY_FORMAT_UNKNOWN) { + goto fail; + } key = JS_GetOpaque2(cx, argv[1], QJS_CORE_CLASS_ID_WEBCRYPTO_KEY); if (key == NULL) { @@ -5097,6 +5103,9 @@ qjs_webcrypto_unwrap_key(JSContext *cx, JSValueConst this_val, int argc, qjs_webcrypto_key_format_t fmt; fmt = qjs_key_format(cx, argv[0]); + if (fmt == QJS_KEY_FORMAT_UNKNOWN) { + goto fail; + } ret = qjs_typed_array_data(cx, argv[1], &data); if (JS_IsException(ret)) { diff --git a/test/webcrypto/key_format.t.mjs b/test/webcrypto/key_format.t.mjs new file mode 100644 index 00000000..a191f183 --- /dev/null +++ b/test/webcrypto/key_format.t.mjs @@ -0,0 +1,58 @@ +/*--- +includes: [compatBuffer.js, compatWebcrypto.js, runTsuite.js] +flags: [async] +---*/ + +async function test(params) { + let key = await crypto.subtle.importKey('raw', new Uint8Array(16), + 'AES-CBC', true, ['encrypt']); + let wrapping_key = await crypto.subtle.importKey('raw', + new Uint8Array(16), + 'AES-KW', false, + ['wrapKey', + 'unwrapKey']); + + try { + switch (params.op) { + case 'exportKey': + await crypto.subtle.exportKey('JWK', key); + break; + + case 'wrapKey': + await crypto.subtle.wrapKey('JWK', key, wrapping_key, 'AES-KW'); + break; + + default: + let wrapped = await crypto.subtle.wrapKey('raw', key, + wrapping_key, + 'AES-KW'); + + await crypto.subtle.unwrapKey('JWK', wrapped, wrapping_key, + 'AES-KW', 'AES-CBC', true, + ['encrypt']); + } + + } catch (e) { + if (!(e instanceof TypeError) || !e.message.includes('JWK')) { + throw Error(`unexpected ${params.op} error: ${e}`); + } + + return 'SUCCESS'; + } + + throw Error(`${params.op} accepted unknown key format`); +} + +let key_format_tsuite = { + name: 'unknown key format', + skip: async () => !await has_webcrypto_algorithm('AES-KW', 128), + T: test, + tests: [ + {op: 'exportKey'}, + {op: 'wrapKey'}, + {op: 'unwrapKey'}, + ], +}; + +run([key_format_tsuite]) +.then($DONE, $DONE);