foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-25 00:29:09 -05:00
Code Issues Packages 1 Wiki Activity

fix(crypto): change Crypto to interface (#10853)

Browse source 
Co-authored-by: Luca Casonato <hello@lcas.dev>
This commit is contained in:
Leo K 2021-06-05 22:56:59 +02:00 committed by GitHub
parent 368c784d7f
commit bb0c90cadb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
extensions/crypto/01_crypto.js
View file

@ -3,48 +3,62 @@
((window) => { ((window) => {
const core = window.Deno.core; const core = window.Deno.core;
const webidl = window.__bootstrap.webidl;
function getRandomValues(arrayBufferView) { class Crypto {
if (!ArrayBuffer.isView(arrayBufferView)) { constructor() {
throw new TypeError( webidl.illegalConstructor();
"Argument 1 does not implement interface ArrayBufferView",
);
} }
if (
!( getRandomValues(arrayBufferView) {
arrayBufferView instanceof Int8Array || webidl.assertBranded(this, Crypto);
arrayBufferView instanceof Uint8Array || const prefix = "Failed to execute 'getRandomValues' on 'Crypto'";
arrayBufferView instanceof Int16Array || webidl.requiredArguments(arguments.length, 1, { prefix });
arrayBufferView instanceof Uint16Array || arrayBufferView = webidl.converters.ArrayBufferView(arrayBufferView, {
arrayBufferView instanceof Int32Array || prefix,
arrayBufferView instanceof Uint32Array || context: "Argument 1",
arrayBufferView instanceof Uint8ClampedArray });
) if (
) { !(
throw new DOMException( arrayBufferView instanceof Int8Array ||
"The provided ArrayBufferView is not an integer array type", arrayBufferView instanceof Uint8Array ||
"TypeMismatchError", arrayBufferView instanceof Int16Array ||
arrayBufferView instanceof Uint16Array ||
arrayBufferView instanceof Int32Array ||
arrayBufferView instanceof Uint32Array ||
arrayBufferView instanceof Uint8ClampedArray
)
) {
throw new DOMException(
"The provided ArrayBufferView is not an integer array type",
"TypeMismatchError",
);
}
const ui8 = new Uint8Array(
arrayBufferView.buffer,
arrayBufferView.byteOffset,
arrayBufferView.byteLength,
); );
core.opSync("op_crypto_get_random_values", ui8);
return arrayBufferView;
}
randomUUID() {
webidl.assertBranded(this, Crypto);
return core.opSync("op_crypto_random_uuid");
}
get [Symbol.toStringTag]() {
return "Crypto";
}
[Symbol.for("Deno.customInspect")](inspect) {
return `${this.constructor.name} ${inspect({})}`;
} }
const ui8 = new Uint8Array(
arrayBufferView.buffer,
arrayBufferView.byteOffset,
arrayBufferView.byteLength,
);
core.opSync("op_crypto_get_random_values", ui8);
return arrayBufferView;
} }
function randomUUID() {
return core.opSync("op_crypto_random_uuid");
}
window.crypto = {
getRandomValues,
randomUUID,
};
window.__bootstrap.crypto = { window.__bootstrap.crypto = {
getRandomValues, crypto: webidl.createBranded(Crypto),
randomUUID, Crypto,
}; };
})(this); })(this);

3
runtime/js/99_main.js
View file

@ -302,7 +302,8 @@ delete Object.prototype.__proto__;
console: util.writable( console: util.writable(
new Console((msg, level) => core.print(msg, level > 1)), new Console((msg, level) => core.print(msg, level > 1)),
), ),
crypto: util.readOnly(crypto), crypto: util.readOnly(crypto.crypto),
Crypto: util.nonEnumerable(crypto.Crypto),
fetch: util.writable(fetch.fetch), fetch: util.writable(fetch.fetch),
performance: util.writable(performance.performance), performance: util.writable(performance.performance),
setInterval: util.writable(timers.setInterval), setInterval: util.writable(timers.setInterval),

10
tools/wpt/expectation.json
View file

@ -72,19 +72,9 @@
}, },
"historical.any.html": true, "historical.any.html": true,
"idlharness.https.any.html": [ "idlharness.https.any.html": [
"Crypto interface: existence and properties of interface object",
"Crypto interface object length",
"Crypto interface object name",
"Crypto interface: existence and properties of interface prototype object",
"Crypto interface: existence and properties of interface prototype object's \"constructor\" property",
"Crypto interface: existence and properties of interface prototype object's @@unscopables property",
"Crypto interface: attribute subtle", "Crypto interface: attribute subtle",
"Crypto interface: operation getRandomValues(ArrayBufferView)", "Crypto interface: operation getRandomValues(ArrayBufferView)",
"Crypto must be primary interface of crypto",
"Stringification of crypto",
"Crypto interface: crypto must inherit property \"subtle\" with the proper type", "Crypto interface: crypto must inherit property \"subtle\" with the proper type",
"Crypto interface: crypto must inherit property \"getRandomValues(ArrayBufferView)\" with the proper type",
"Crypto interface: calling getRandomValues(ArrayBufferView) on crypto with too few arguments must throw TypeError",
"CryptoKey interface: existence and properties of interface object", "CryptoKey interface: existence and properties of interface object",
"CryptoKey interface object length", "CryptoKey interface object length",
"CryptoKey interface object name", "CryptoKey interface object name",