Commit cc19107

Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107

4 files changed

Lines changed: 98 additions & 70 deletions

File tree

‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎

Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError

‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();

‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful

‎test/fixtures/wpt/versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
},
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
},
102102
"webidl": {

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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
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 cc19107
Browse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
test: update WPT for WebCryptoAPI to 4c2fd05ed5
PR-URL: #65150
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 69e4fab commit cc19107
4 files changed
Lines changed: 98 additions & 70 deletions
File tree
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures.js‎
Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
functionrun_test(algorithmNames){
2-
varsubtle=crypto.subtle;// Change to test prefixed implementations
3-
41
// These tests check that generateKey throws an error, and that
52
// the error is of the right type, for a wide set of incorrect parameters.
63
//
@@ -19,42 +16,83 @@ function run_test(algorithmNames) {
1916
// helper functions that generate all possible test parameters for
2017
// different situations.
2118

22-
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
19+
functionparameterString(algorithm,extractable,usages){
20+
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
21+
alert(algorithm);
22+
}
2323

24+
varresult="("+
25+
objectToString(algorithm)+", "+
26+
objectToString(extractable)+", "+
27+
objectToString(usages)+
28+
")";
2429

25-
functionparameterString(algorithm,extractable,usages){
26-
if(typeofalgorithm!=="object"&&typeofalgorithm!=="string"){
27-
alert(algorithm);
28-
}
30+
returnresult;
31+
}
2932

30-
varresult="("+
31-
objectToString(algorithm)+", "+
32-
objectToString(extractable)+", "+
33-
objectToString(usages)+
34-
")";
33+
// Test that a given combination of parameters results in an error,
34+
// AND that it is the correct kind of error.
35+
//
36+
// Expected error is either a number, tested against the error code,
37+
// or a string, tested against the error name.
38+
functiontestError(algorithm,extractable,usages,expectedError,testTag){
39+
promise_test(function(test){
40+
returncrypto.subtle.generateKey(algorithm,extractable,usages)
41+
.then(function(result){
42+
assert_unreached("Operation succeeded, but should not have");
43+
},function(err){
44+
if(typeofexpectedError==="number"){
45+
assert_equals(err.code,expectedError,testTag+" not supported");
46+
}else{
47+
assert_equals(err.name,expectedError,testTag+" not supported");
48+
}
49+
});
50+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
51+
}
3552

36-
returnresult;
37-
}
3853

39-
// Test that a given combination of parameters results in an error,
40-
// AND that it is the correct kind of error.
41-
//
42-
// Expected error is either a number, tested against the error code,
43-
// or a string, tested against the error name.
44-
functiontestError(algorithm,extractable,usages,expectedError,testTag){
45-
promise_test(function(test){
46-
returncrypto.subtle.generateKey(algorithm,extractable,usages)
47-
.then(function(result){
48-
assert_unreached("Operation succeeded, but should not have");
49-
},function(err){
50-
if(typeofexpectedError==="number"){
51-
assert_equals(err.code,expectedError,testTag+" not supported");
52-
}else{
53-
assert_equals(err.name,expectedError,testTag+" not supported");
54-
}
54+
// Algorithm normalization happens before generateKey looks at any other
55+
// argument, so these cases are independent of the algorithm under test and
56+
// only need to run once for the whole suite.
57+
functionrun_bad_algorithm_test(){
58+
// Algorithm normalization should fail with "Not supported"
59+
varbadAlgorithmNames=[
60+
"AES",
61+
{name: "AES"},
62+
{name: "AES",length: 128},
63+
{name: "AES-CMAC",length: 128},// Removed after CR
64+
{name: "AES-CFB",length: 128},// Removed after CR
65+
{name: "HMAC",hash: "MD5"},
66+
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
67+
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
68+
{name: "EC",namedCurve: "P521"}
69+
];
70+
71+
72+
// Algorithm normalization failures should be found first
73+
// - all other parameters can be good or bad, should fail
74+
// due to NotSupportedError.
75+
badAlgorithmNames.forEach(function(algorithm){
76+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
77+
.forEach(function(usages){
78+
[false,true,"RED",7].forEach(function(extractable){
79+
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
5580
});
56-
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
57-
}
81+
});
82+
});
83+
84+
// Empty algorithm should fail with TypeError
85+
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
86+
.forEach(function(usages){
87+
[false,true,"RED",7].forEach(function(extractable){
88+
testError({},extractable,usages,"TypeError","Empty algorithm");
89+
});
90+
});
91+
}
92+
93+
94+
functionrun_test(algorithmNames){
95+
vartestVectors=getGenerateKeyTestVectors(algorithmNames);
5896

5997

6098
// Given an algorithm name, create several invalid parameters.
@@ -108,45 +146,9 @@ function run_test(algorithmNames) {
108146

109147

110148
// Now test for properly handling errors
111-
// - Unsupported algorithm
112149
// - Bad usages for algorithm
113150
// - Bad key lengths
114151

115-
// Algorithm normalization should fail with "Not supported"
116-
varbadAlgorithmNames=[
117-
"AES",
118-
{name: "AES"},
119-
{name: "AES",length: 128},
120-
{name: "AES-CMAC",length: 128},// Removed after CR
121-
{name: "AES-CFB",length: 128},// Removed after CR
122-
{name: "HMAC",hash: "MD5"},
123-
{name: "RSA",hash: "SHA-256",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
124-
{name: "RSA-PSS",hash: "SHA",modulusLength: 2048,publicExponent: newUint8Array([1,0,1])},
125-
{name: "EC",namedCurve: "P521"}
126-
];
127-
128-
129-
// Algorithm normalization failures should be found first
130-
// - all other parameters can be good or bad, should fail
131-
// due to NotSupportedError.
132-
badAlgorithmNames.forEach(function(algorithm){
133-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
134-
.forEach(function(usages){
135-
[false,true,"RED",7].forEach(function(extractable){
136-
testError(algorithm,extractable,usages,"NotSupportedError","Bad algorithm");
137-
});
138-
});
139-
});
140-
141-
// Empty algorithm should fail with TypeError
142-
allValidUsages(["decrypt","sign","deriveBits"],true,[])// Small search space, shouldn't matter because should fail before used
143-
.forEach(function(usages){
144-
[false,true,"RED",7].forEach(function(extractable){
145-
testError({},extractable,usages,"TypeError","Empty algorithm");
146-
});
147-
});
148-
149-
150152
// Algorithms normalize okay, but usages bad (though not empty).
151153
// It shouldn't matter what other extractable is. Should fail
152154
// due to SyntaxError
‎test/fixtures/wpt/WebCryptoAPI/generateKey/failures_bad_algorithm.https.any.js‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// META: title=WebCryptoAPI: generateKey() for Failures
2+
// META: timeout=long
3+
// META: script=../util/helpers.js
4+
// META: script=failures.js
5+
run_bad_algorithm_test();
‎test/fixtures/wpt/WebCryptoAPI/generateKey/successes.js‎
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ function run_test(algorithmNames, slowTest) {
110110
assert_unreached("exportKey threw an unexpected error: "+err.toString());
111111
})
112112
},testTag+": generateKey"+parameterString(algorithm,extractable,usages));
113+
114+
// Special case for ECDH and ECDSA: check that the generated key length is consistent.
115+
// Particularly for P-521, there is a high risk of the generated key being one byte short
116+
// if the implementation isn't careful.
117+
if(algorithm.namedCurve&&extractable){
118+
promise_test(asyncfunction(test){
119+
// We run about 20 variants of this test, times 10 key generations below,
120+
// so this should have a decent chance of catching issues.
121+
awaitPromise.all(Array.from({length: 10}).map(async()=>{
122+
const{ privateKey, publicKey }=awaitsubtle.generateKey(algorithm,extractable,usages);
123+
const[jwkPub,jwkPriv]=awaitPromise.all([
124+
subtle.exportKey('jwk',publicKey),
125+
subtle.exportKey('jwk',privateKey),
126+
]);
127+
constexpectedLength=Math.ceil(Math.ceil(parseInt(algorithm.namedCurve.substring(2))/8)*4/3);
128+
assert_equals(jwkPub.x.length,expectedLength,"Public key value x has correct length");
129+
assert_equals(jwkPub.y.length,expectedLength,"Public key value y has correct length");
130+
assert_equals(jwkPriv.d.length,expectedLength,"Private key value d has correct length");
131+
}));
132+
},testTag+": generateKey"+parameterString(algorithm,extractable,usages)+" produces consistent length key");
133+
}
113134
}
114135

115136
// Test all valid sets of parameters for successful
‎test/fixtures/wpt/versions.json‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"path": "web-locks"
9797
 },
9898
"WebCryptoAPI": {
99-
"commit": "82c3d9069cf2e93e5528a1f428fa122bd9af651d",
99+
"commit": "4c2fd05ed5d0b90a9e1fcdcb35f6671bd461de0d",
100100
"path": "WebCryptoAPI"
101101
 },
102102
"webidl": {
0 commit comments
Comments
 (0)