Skip to content

fix(crypto): Treat undefined JWK members as absent, not "undefined" #333

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

Merged
andreiltd merged 4 commits into from
Oct 22, 2026
Merged

fix(crypto): Treat undefined JWK members as absent, not "undefined" #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
efe0e2e
Treat undefined JWK members as absent, not "undefined".
VirtualTim Oct 20, 2026
0181db2
Merge branch 'main' into jwk-undefined-members
VirtualTim Oct 22, 2026
44f97b5
Regenerate test expectations
VirtualTim Oct 22, 2026
e0facf6
Merge branch 'main' into jwk-undefined-members
VirtualTim Oct 22, 2026
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
42 changes: 14 additions & 28 deletions builtins/web/crypto/json-web-key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@ namespace builtins::web::crypto {
namespace {
JS::Result<std::optional<std::string>>
extractStringPropertyFromObject(JSContext *cx, JS::HandleObject object, const char* property) {
bool has_property = false;
if (!JS_HasProperty(cx, object, property, &has_property)) {
return JS::Result<std::optional<std::string>>(JS::Error());
}
if (!has_property) {
return std::optional<std::string>(std::nullopt);
}
JS::RootedValue value(cx);
if (!JS_GetProperty(cx, object, property, &value)) {
return JS::Result<std::optional<std::string>>(JS::Error());
}
// A dictionary member whose value is undefined is treated as not present:
// https://webidl.spec.whatwg.org/#js-dictionary
if (value.isUndefined()) {
return std::optional<std::string>(std::nullopt);
}
// Convert into a String following https://tc39.es/ecma262/#sec-tostring
auto chars = core::encode(cx, value);
if (!chars) {
Expand Down Expand Up @@ -163,30 +161,22 @@ std::unique_ptr<JsonWebKey> JsonWebKey::parse(JSContext *cx, JS::HandleValue val
// boolean ext;
std::optional<bool> ext = std::nullopt;
{
bool has_ext = false;
if (!JS_HasProperty(cx, object, "ext", &has_ext)) {
JS::RootedValue ext_val(cx);
if (!JS_GetProperty(cx, object, "ext", &ext_val)) {
return nullptr;
}
if (has_ext) {
JS::RootedValue ext_val(cx);
if (!JS_GetProperty(cx, object, "ext", &ext_val)) {
return nullptr;
}
if (!ext_val.isUndefined()) {
ext = JS::ToBoolean(ext_val);
}
}
// sequence<DOMString> key_ops;
std::vector<std::string> key_ops;
{
bool has_key_ops = false;
if (!JS_HasProperty(cx, object, "key_ops", &has_key_ops)) {
JS::RootedValue key_ops_val(cx);
if (!JS_GetProperty(cx, object, "key_ops", &key_ops_val)) {
return nullptr;
}
if (has_key_ops) {
JS::RootedValue key_ops_val(cx);
if (!JS_GetProperty(cx, object, "key_ops", &key_ops_val)) {
return nullptr;
}
if (!key_ops_val.isUndefined()) {
bool key_ops_is_array = false;
if (!JS::IsArrayObject(cx, key_ops_val, &key_ops_is_array)) {
return nullptr;
Expand Down Expand Up @@ -255,15 +245,11 @@ std::unique_ptr<JsonWebKey> JsonWebKey::parse(JSContext *cx, JS::HandleValue val

std::vector<RsaOtherPrimesInfo> oth;
{
bool has_oth = false;
if (!JS_HasProperty(cx, object, "oth", &has_oth)) {
JS::RootedValue oth_val(cx);
if (!JS_GetProperty(cx, object, "oth", &oth_val)) {
return nullptr;
}
if (has_oth) {
JS::RootedValue oth_val(cx);
if (!JS_GetProperty(cx, object, "oth", &oth_val)) {
return nullptr;
}
if (!oth_val.isUndefined()) {
bool oth_is_array = false;
if (!JS::IsArrayObject(cx, oth_val, &oth_is_array)) {
return nullptr;
Expand Down
20 changes: 10 additions & 10 deletions .../expectations/WebCryptoAPI/import_export/okp_importKey_failures_Ed25519.https.any.js.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,37 +2253,37 @@
"status": "PASS"
},
"Import from a non-extractable: importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Import from a non-extractable: importKey(jwk(private), {name: Ed25519}, true, [sign])": {
"status": "PASS"
},
"Import from a non-extractable: importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'use' field: importKey(jwk(private), Ed25519, true, [sign])": {
"status": "PASS"
},
"Invalid 'use' field: importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'use' field: importKey(jwk(private), {name: Ed25519}, true, [sign])": {
"status": "PASS"
},
"Invalid 'use' field: importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'crv' field: importKey(jwk(private), Ed25519, true, [sign])": {
"status": "PASS"
},
"Invalid 'crv' field: importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'crv' field: importKey(jwk(private), {name: Ed25519}, true, [sign])": {
"status": "PASS"
},
"Invalid 'crv' field: importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'alg' field 'ed25519': importKey(jwk(private), Ed25519, true, [sign])": {
"status": "PASS"
Expand All @@ -2292,10 +2292,10 @@
"status": "PASS"
},
"Invalid 'alg' field 'ed25519': importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'alg' field 'ED25519': importKey(jwk (public) , Ed25519, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'alg' field 'ed25519': importKey(jwk(private), {name: Ed25519}, true, [sign])": {
"status": "PASS"
Expand All @@ -2304,9 +2304,9 @@
"status": "PASS"
},
"Invalid 'alg' field 'ed25519': importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "FAIL"
"status": "PASS"
},
"Invalid 'alg' field 'ED25519': importKey(jwk (public) , {name: Ed25519}, true, [verify])": {
"status": "FAIL"
"status": "PASS"
}
}
Loading