mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-06-01 07:52:50 +00:00
LibWeb: Implement most of ECDSA verify for SubtleCrypto
This commit is contained in:
parent
6906b7c1e6
commit
ae230c9150
Notes:
sideshowbarker
2024-07-16 20:21:48 +09:00
Author: https://github.com/stelar7
Commit: ae230c9150
Pull-request: https://github.com/SerenityOS/serenity/pull/23737
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/trflynn89
5 changed files with 156 additions and 1 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
FIXME: This will fail as we dont support ECDSA sign()
|
||||||
|
FAIL: Verification not ok
|
45
Tests/LibWeb/Text/input/Crypto/SubtleCrypto-verify.html
Normal file
45
Tests/LibWeb/Text/input/Crypto/SubtleCrypto-verify.html
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
<script src="../include.js"></script>
|
||||||
|
<script>
|
||||||
|
asyncTest(async done => {
|
||||||
|
const encoder = new TextEncoder();
|
||||||
|
const message = "Hello friends";
|
||||||
|
const encoded_message = encoder.encode(message);
|
||||||
|
|
||||||
|
const key_algorithm = {
|
||||||
|
name: "ECDSA",
|
||||||
|
namedCurve: "P-384",
|
||||||
|
};
|
||||||
|
const extractable = true;
|
||||||
|
const usages = ["sign", "verify"];
|
||||||
|
const key = await window.crypto.subtle.generateKey(key_algorithm, extractable, usages);
|
||||||
|
|
||||||
|
console.log(key.publicKey);
|
||||||
|
|
||||||
|
const signature_algorithm = {
|
||||||
|
name: "ECDSA",
|
||||||
|
hash: { name: "SHA-384" },
|
||||||
|
};
|
||||||
|
const signature = await window.crypto.subtle.sign(
|
||||||
|
signature_algorithm,
|
||||||
|
key.privateKey,
|
||||||
|
encoded_message
|
||||||
|
);
|
||||||
|
|
||||||
|
let result = await window.crypto.subtle.verify(
|
||||||
|
signature_algorithm,
|
||||||
|
key.publicKey,
|
||||||
|
signature,
|
||||||
|
encoded_message
|
||||||
|
);
|
||||||
|
|
||||||
|
println(`FIXME: This will fail as we dont support ECDSA sign()`);
|
||||||
|
|
||||||
|
if (result) {
|
||||||
|
println(`Verified OK`);
|
||||||
|
} else {
|
||||||
|
println(`FAIL: Verification not ok`);
|
||||||
|
}
|
||||||
|
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
</script>
|
|
@ -1104,4 +1104,110 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::ArrayBuffer>> ECDSA::sign(AlgorithmPara
|
||||||
return WebIDL::NotSupportedError::create(realm, "ECDSA signing is not supported yet"_fly_string);
|
return WebIDL::NotSupportedError::create(realm, "ECDSA signing is not supported yet"_fly_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://w3c.github.io/webcrypto/#ecdsa-operations
|
||||||
|
WebIDL::ExceptionOr<JS::Value> ECDSA::verify(AlgorithmParams const& params, JS::NonnullGCPtr<CryptoKey> key, ByteBuffer const& signature, ByteBuffer const& message)
|
||||||
|
{
|
||||||
|
auto& realm = m_realm;
|
||||||
|
auto const& normalized_algorithm = static_cast<EcdsaParams const&>(params);
|
||||||
|
|
||||||
|
// 1. If the [[type]] internal slot of key is not "public", then throw an InvalidAccessError.
|
||||||
|
if (key->type() != Bindings::KeyType::Public)
|
||||||
|
return WebIDL::InvalidAccessError::create(realm, "Key is not a public key"_fly_string);
|
||||||
|
|
||||||
|
// 2. Let hashAlgorithm be the hash member of normalizedAlgorithm.
|
||||||
|
[[maybe_unused]] auto const& hash_algorithm = TRY(normalized_algorithm.hash.visit(
|
||||||
|
[](String const& name) -> JS::ThrowCompletionOr<String> { return name; },
|
||||||
|
[&](JS::Handle<JS::Object> const& obj) -> JS::ThrowCompletionOr<String> {
|
||||||
|
auto name_property = TRY(obj->get("name"));
|
||||||
|
return name_property.to_string(m_realm.vm()); }));
|
||||||
|
|
||||||
|
// 3. Let M be the result of performing the digest operation specified by hashAlgorithm using message.
|
||||||
|
::Crypto::Hash::HashKind hash_kind;
|
||||||
|
if (hash_algorithm.equals_ignoring_ascii_case("SHA-1"sv)) {
|
||||||
|
hash_kind = ::Crypto::Hash::HashKind::SHA1;
|
||||||
|
} else if (hash_algorithm.equals_ignoring_ascii_case("SHA-256"sv)) {
|
||||||
|
hash_kind = ::Crypto::Hash::HashKind::SHA256;
|
||||||
|
} else if (hash_algorithm.equals_ignoring_ascii_case("SHA-384"sv)) {
|
||||||
|
hash_kind = ::Crypto::Hash::HashKind::SHA384;
|
||||||
|
} else if (hash_algorithm.equals_ignoring_ascii_case("SHA-512"sv)) {
|
||||||
|
hash_kind = ::Crypto::Hash::HashKind::SHA512;
|
||||||
|
} else {
|
||||||
|
return WebIDL::NotSupportedError::create(m_realm, MUST(String::formatted("Invalid hash function '{}'", hash_algorithm)));
|
||||||
|
}
|
||||||
|
::Crypto::Hash::Manager hash { hash_kind };
|
||||||
|
hash.update(message);
|
||||||
|
auto digest = hash.digest();
|
||||||
|
|
||||||
|
auto result_buffer = ByteBuffer::copy(digest.immutable_data(), hash.digest_size());
|
||||||
|
if (result_buffer.is_error())
|
||||||
|
return WebIDL::OperationError::create(m_realm, "Failed to create result buffer"_fly_string);
|
||||||
|
|
||||||
|
auto M = result_buffer.release_value();
|
||||||
|
|
||||||
|
// 4. Let Q be the ECDSA public key associated with key.
|
||||||
|
auto Q = key->handle().visit(
|
||||||
|
[](ByteBuffer data) -> ByteBuffer {
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
[](auto) -> ByteBuffer { VERIFY_NOT_REACHED(); });
|
||||||
|
|
||||||
|
// FIXME: 5. Let params be the EC domain parameters associated with key.
|
||||||
|
|
||||||
|
// 6. If the namedCurve attribute of the [[algorithm]] internal slot of key is "P-256", "P-384" or "P-521":
|
||||||
|
auto const& internal_algorithm = static_cast<EcKeyAlgorithm const&>(*key->algorithm());
|
||||||
|
auto const& named_curve = internal_algorithm.named_curve();
|
||||||
|
|
||||||
|
auto result = false;
|
||||||
|
|
||||||
|
Variant<Empty, ::Crypto::Curves::SECP256r1, ::Crypto::Curves::SECP384r1> curve;
|
||||||
|
if (named_curve.is_one_of("P-256"sv, "P-384"sv, "P-521"sv)) {
|
||||||
|
if (named_curve.equals_ignoring_ascii_case("P-256"sv))
|
||||||
|
curve = ::Crypto::Curves::SECP256r1 {};
|
||||||
|
|
||||||
|
if (named_curve.equals_ignoring_ascii_case("P-384"sv))
|
||||||
|
curve = ::Crypto::Curves::SECP384r1 {};
|
||||||
|
|
||||||
|
// FIXME: Support P-521
|
||||||
|
if (named_curve.equals_ignoring_ascii_case("P-521"sv))
|
||||||
|
return WebIDL::NotSupportedError::create(m_realm, "'P-521' is not supported yet"_fly_string);
|
||||||
|
|
||||||
|
// Perform the ECDSA verifying process, as specified in [RFC6090], Section 5.3,
|
||||||
|
// with M as the received message,
|
||||||
|
// signature as the received signature
|
||||||
|
// and using params as the EC domain parameters,
|
||||||
|
// and Q as the public key.
|
||||||
|
|
||||||
|
// NOTE: verify() takes the signature in X.509 format but JS uses IEEE P1363 format, so we need to convert it
|
||||||
|
// FIXME: Dont construct an ASN1 object here just to pass it to verify
|
||||||
|
auto half_size = signature.size() / 2;
|
||||||
|
auto r = ::Crypto::UnsignedBigInteger::import_data(signature.data(), half_size);
|
||||||
|
auto s = ::Crypto::UnsignedBigInteger::import_data(signature.data() + half_size, half_size);
|
||||||
|
|
||||||
|
::Crypto::ASN1::Encoder encoder;
|
||||||
|
(void)encoder.write_constructed(::Crypto::ASN1::Class::Universal, ::Crypto::ASN1::Kind::Sequence, [&] {
|
||||||
|
(void)encoder.write(r);
|
||||||
|
(void)encoder.write(s);
|
||||||
|
});
|
||||||
|
auto encoded_signature = encoder.finish();
|
||||||
|
|
||||||
|
auto maybe_result = curve.visit(
|
||||||
|
[](Empty const&) -> ErrorOr<bool> { return Error::from_string_view("Failed to create valid crypto instance"sv); },
|
||||||
|
[&](auto instance) { return instance.verify(M, Q, encoded_signature); });
|
||||||
|
|
||||||
|
if (maybe_result.is_error()) {
|
||||||
|
auto error_message = MUST(FlyString::from_utf8(maybe_result.error().string_literal()));
|
||||||
|
return WebIDL::OperationError::create(m_realm, error_message);
|
||||||
|
}
|
||||||
|
|
||||||
|
result = maybe_result.release_value();
|
||||||
|
} else {
|
||||||
|
// FIXME: Otherwise, the namedCurve attribute of the [[algorithm]] internal slot of key is a value specified in an applicable specification:
|
||||||
|
// FIXME: Perform the ECDSA verification steps specified in that specification passing in M, signature, params and Q and resulting in an indication of whether or not the purported signature is valid.
|
||||||
|
}
|
||||||
|
|
||||||
|
// 9. Let result be a boolean with the value true if the signature is valid and the value false otherwise.
|
||||||
|
// 10. Return result.
|
||||||
|
return JS::Value(result);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -167,7 +167,7 @@ public:
|
||||||
return WebIDL::NotSupportedError::create(m_realm, "sign is not supported"_fly_string);
|
return WebIDL::NotSupportedError::create(m_realm, "sign is not supported"_fly_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::ArrayBuffer>> verify(AlgorithmParams const&, JS::NonnullGCPtr<CryptoKey>, ByteBuffer const&, ByteBuffer const&)
|
virtual WebIDL::ExceptionOr<JS::Value> verify(AlgorithmParams const&, JS::NonnullGCPtr<CryptoKey>, ByteBuffer const&, ByteBuffer const&)
|
||||||
{
|
{
|
||||||
return WebIDL::NotSupportedError::create(m_realm, "verify is not supported"_fly_string);
|
return WebIDL::NotSupportedError::create(m_realm, "verify is not supported"_fly_string);
|
||||||
}
|
}
|
||||||
|
@ -251,6 +251,7 @@ private:
|
||||||
class ECDSA : public AlgorithmMethods {
|
class ECDSA : public AlgorithmMethods {
|
||||||
public:
|
public:
|
||||||
virtual WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::ArrayBuffer>> sign(AlgorithmParams const&, JS::NonnullGCPtr<CryptoKey>, ByteBuffer const&) override;
|
virtual WebIDL::ExceptionOr<JS::NonnullGCPtr<JS::ArrayBuffer>> sign(AlgorithmParams const&, JS::NonnullGCPtr<CryptoKey>, ByteBuffer const&) override;
|
||||||
|
virtual WebIDL::ExceptionOr<JS::Value> verify(AlgorithmParams const&, JS::NonnullGCPtr<CryptoKey>, ByteBuffer const&, ByteBuffer const&) override;
|
||||||
|
|
||||||
virtual WebIDL::ExceptionOr<Variant<JS::NonnullGCPtr<CryptoKey>, JS::NonnullGCPtr<CryptoKeyPair>>> generate_key(AlgorithmParams const&, bool, Vector<Bindings::KeyUsage> const&) override;
|
virtual WebIDL::ExceptionOr<Variant<JS::NonnullGCPtr<CryptoKey>, JS::NonnullGCPtr<CryptoKeyPair>>> generate_key(AlgorithmParams const&, bool, Vector<Bindings::KeyUsage> const&) override;
|
||||||
|
|
||||||
|
|
|
@ -641,6 +641,7 @@ SupportedAlgorithmsMap supported_algorithms()
|
||||||
|
|
||||||
// https://w3c.github.io/webcrypto/#ecdsa
|
// https://w3c.github.io/webcrypto/#ecdsa
|
||||||
define_an_algorithm<ECDSA, EcdsaParams>("sign"_string, "ECDSA"_string);
|
define_an_algorithm<ECDSA, EcdsaParams>("sign"_string, "ECDSA"_string);
|
||||||
|
define_an_algorithm<ECDSA, EcdsaParams>("verify"_string, "ECDSA"_string);
|
||||||
define_an_algorithm<ECDSA, EcKeyGenParams>("generateKey"_string, "ECDSA"_string);
|
define_an_algorithm<ECDSA, EcKeyGenParams>("generateKey"_string, "ECDSA"_string);
|
||||||
|
|
||||||
return internal_object;
|
return internal_object;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue