Commit 7f7df06

Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #65091 Refs: w3c/webcrypto#555 Refs: WICG/webcrypto-modern-algos#65 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06

3 files changed

Lines changed: 139 additions & 1 deletion

File tree

‎lib/internal/crypto/webcrypto.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){

‎test/parallel/test-webcrypto-enforce-range.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());

‎test/parallel/test-webcrypto-webidl.js‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 7f7df06
Browse files
panvaaduh95
panva
authored and
aduh95
committed
lib: add and test [EnforceRange] in webcrypto dictionaries
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: #65091
Refs: w3c/webcrypto#555
Refs: WICG/webcrypto-modern-algos#65
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent fa52f11 commit 7f7df06
3 files changed
Lines changed: 139 additions & 1 deletion
File tree
‎lib/internal/crypto/webcrypto.js‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,11 @@ function deriveBitsImpl(algorithm, baseKey, length = null) {
255255
prefix,'AlgorithmIdentifier',algorithm,i++);
256256
baseKey=convertSubtleArgument(prefix,'CryptoKey',baseKey,i++);
257257
if(length!==null){
258-
length=convertSubtleArgument(prefix,'unsigned long',length,i++);
258+
length=webidl.converters['unsigned long'](length,{
259+
 prefix,
260+
context: kArgumentContexts[i++],
261+
enforceRange: true,
262+
});
259263
}
260264

261265
constnormalizedAlgorithm=normalizeAlgorithm(algorithm,'deriveBits');
@@ -1695,6 +1699,7 @@ class SubtleCrypto {
16951699
length=webidl.converters['unsigned long'](length,{
16961700
 prefix,
16971701
context: '3rd argument',
1702+
enforceRange: true,
16981703
});
16991704
}
17001705
}elseif(operation==='getPublicKey'){
‎test/parallel/test-webcrypto-enforce-range.js‎
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
constcommon=require('../common');
4+
5+
if(!common.hasCrypto)
6+
common.skip('missing crypto');
7+
8+
constassert=require('assert');
9+
const{ SubtleCrypto }=globalThis;
10+
const{ subtle }=globalThis.crypto;
11+
12+
constalgorithm={
13+
name: 'HKDF',
14+
hash: 'SHA-256',
15+
info: newUint8Array(),
16+
salt: newUint8Array(32),
17+
};
18+
constinvalidLength=2**32;
19+
constexpectedError={
20+
code: 'ERR_OUT_OF_RANGE',
21+
name: 'TypeError',
22+
};
23+
24+
assert.throws(
25+
()=>SubtleCrypto.supports('deriveBits',algorithm,invalidLength),
26+
expectedError);
27+
28+
(async()=>{
29+
constkey=awaitsubtle.importKey(
30+
'raw',newUint8Array(32),'HKDF',false,['deriveBits']);
31+
32+
awaitassert.rejects(
33+
subtle.deriveBits(algorithm,key,invalidLength),
34+
expectedError);
35+
})().then(common.mustCall());
‎test/parallel/test-webcrypto-webidl.js‎
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,104 @@ function assertJsonWebKey(actual, expected) {
119119
}
120120
}
121121

122+
// [EnforceRange] integer dictionary members
123+
{
124+
constkOctetMax=2**8-1;
125+
constkUnsignedShortMax=2**16-1;
126+
constkUnsignedLongMax=2**32-1;
127+
constempty=Buffer.alloc(0);
128+
constrsaKeyGen={
129+
name: 'RSA-PSS',
130+
modulusLength: 2048,
131+
publicExponent: newUint8Array([1,0,1]),
132+
};
133+
constaesKeyParams={name: 'AES-GCM',length: 128};
134+
consthmacKeyParams={
135+
name: 'HMAC',
136+
hash: 'SHA-256',
137+
length: 128,
138+
};
139+
constkmacKeyParams={name: 'KMAC128',length: 128};
140+
constcases=[
141+
['RsaKeyGenParams',rsaKeyGen,
142+
{modulusLength: kUnsignedLongMax}],
143+
['RsaHashedKeyGenParams',{ ...rsaKeyGen,hash: 'SHA-256'},
144+
{modulusLength: kUnsignedLongMax}],
145+
['AesKeyGenParams',aesKeyParams,
146+
{length: kUnsignedShortMax}],
147+
['RsaPssParams',{name: 'RSA-PSS',saltLength: 20},
148+
{saltLength: kUnsignedLongMax}],
149+
['HmacKeyGenParams',hmacKeyParams,
150+
{length: kUnsignedLongMax}],
151+
['HmacImportParams',hmacKeyParams,
152+
{length: kUnsignedLongMax}],
153+
['CShakeParams',{name: 'cSHAKE128',outputLength: 256},
154+
{outputLength: kUnsignedLongMax}],
155+
['Pbkdf2Params',{
156+
name: 'PBKDF2',
157+
salt: empty,
158+
iterations: 1,
159+
hash: 'SHA-256',
160+
},{iterations: kUnsignedLongMax}],
161+
['AesDerivedKeyParams',aesKeyParams,
162+
{length: kUnsignedShortMax}],
163+
['AeadParams',{
164+
name: 'AES-GCM',
165+
iv: Buffer.alloc(12),
166+
tagLength: 128,
167+
},{tagLength: kOctetMax}],
168+
['AesCtrParams',{
169+
name: 'AES-CTR',
170+
counter: Buffer.alloc(16),
171+
length: 128,
172+
},{length: kOctetMax}],
173+
['Argon2Params',{
174+
name: 'Argon2id',
175+
nonce: Buffer.alloc(8),
176+
parallelism: 1,
177+
memory: 8,
178+
passes: 1,
179+
version: 0x13,
180+
},{
181+
parallelism: kUnsignedLongMax,
182+
memory: kUnsignedLongMax,
183+
passes: kUnsignedLongMax,
184+
version: kOctetMax,
185+
}],
186+
['KmacKeyGenParams',kmacKeyParams,
187+
{length: kUnsignedLongMax}],
188+
['KmacImportParams',kmacKeyParams,
189+
{length: kUnsignedLongMax}],
190+
['KmacParams',{name: 'KMAC128',outputLength: 256},
191+
{outputLength: kUnsignedLongMax}],
192+
['KangarooTwelveParams',{name: 'KT128',outputLength: 256},
193+
{outputLength: kUnsignedLongMax}],
194+
['TurboShakeParams',{
195+
name: 'TurboSHAKE128',
196+
outputLength: 256,
197+
domainSeparation: 0x1f,
198+
},{
199+
outputLength: kUnsignedLongMax,
200+
domainSeparation: kOctetMax,
201+
}],
202+
];
203+
204+
for(const[dictionary,base,members]ofcases){
205+
constconverter=converters[dictionary];
206+
assertIdlDictionary(converter(base,opts),base);
207+
208+
for(const[member,max]ofObject.entries(members)){
209+
assert.throws(
210+
()=>converter({ ...base,[member]: -1},opts),{
211+
name: 'TypeError',
212+
code: 'ERR_OUT_OF_RANGE',
213+
message: `${prefix}: ${member} in ${context} is outside `+
214+
`the expected range of 0 to ${max}.`,
215+
});
216+
}
217+
}
218+
}
219+
122220
// DOMString
123221
{
124222
assert.strictEqual(converters.DOMString(1),'1');
0 commit comments
Comments
 (0)