Commit 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

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 2a0b1ec

Browse files
sankalpsthakuraduh95
authored andcommitted
tls: throw on invalid ALPNProtocols instead of aborting
tls.connect() with malformed ALPNProtocols hit CHECK_EQ(0, SSL_set_alpn_protos(...)) in the C++ layer and aborted the process with SIGABRT. Validate in JS instead, in convertALPNProtocols, so both client and server fail early with a recoverable ERR_INVALID_ARG_VALUE: - zero-length string protocols now throw from convertProtocols - wire-format buffers are checked for zero-length and truncated entries - an empty buffer or array is still accepted and means skip ALPN, matching the historical behavior for [] The C++ CHECK_EQ is left unchanged: once JS has validated the input, a non-zero SSL_set_alpn_protos return is an internal invariant failure rather than user-facing input. Fixes: #65069 Signed-off-by: Sankalp Thakur <sankalphimself@gmail.com> PR-URL: #65076 Reviewed-By: Tim Perry <pimterry@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent ac3c412 commit 2a0b1ec

3 files changed

Lines changed: 122 additions & 8 deletions

File tree

‎lib/tls.js‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ function convertProtocols(protocols) {
251251
constlens=newArray(protocols.length);
252252
constbuff=Buffer.allocUnsafe(protocols.reduce((p,c,i)=>{
253253
constlen=Buffer.byteLength(c);
254+
if(len===0){
255+
thrownewERR_INVALID_ARG_VALUE(`protocols[${i}]`,c,
256+
'must be a non-empty string');
257+
}
254258
if(len>255){
255259
thrownewERR_OUT_OF_RANGE('The byte length of the protocol at index '+
256260
`${i} exceeds the maximum length.`,'<= 255',len,true);
@@ -269,18 +273,41 @@ function convertProtocols(protocols) {
269273
returnbuff;
270274
}
271275

276+
functionvalidateALPNBuffer(buffer){
277+
// Wire format: sequence of <len><proto> where len is 1 byte (1-255) and
278+
// exactly len bytes follow, no trailing bytes, no zero-length entries.
279+
// Empty buffer is allowed and means skip ALPN (same as []).
280+
letoffset=0;
281+
while(offset<buffer.length){
282+
constlen=buffer[offset];
283+
if(len===0){
284+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
285+
'must not contain zero-length protocol');
286+
}
287+
if(offset+1+len>buffer.length){
288+
thrownewERR_INVALID_ARG_VALUE('ALPNProtocols',buffer,
289+
'contains truncated protocol');
290+
}
291+
offset+=1+len;
292+
}
293+
}
294+
272295
exports.convertALPNProtocols=functionconvertALPNProtocols(protocols,out){
273296
// If protocols is Array - translate it into buffer
274297
if(ArrayIsArray(protocols)){
275298
out.ALPNProtocols=convertProtocols(protocols);
276299
}elseif(isUint8Array(protocols)){
277300
// Copy new buffer not to be modified by user.
278-
out.ALPNProtocols=Buffer.from(protocols);
301+
constbuf=Buffer.from(protocols);
302+
validateALPNBuffer(buf);
303+
out.ALPNProtocols=buf;
279304
}elseif(isArrayBufferView(protocols)){
280-
out.ALPNProtocols=Buffer.from(protocols.buffer.slice(
305+
constbuf=Buffer.from(protocols.buffer.slice(
281306
protocols.byteOffset,
282307
protocols.byteOffset+protocols.byteLength,
283308
));
309+
validateALPNBuffer(buf);
310+
out.ALPNProtocols=buf;
284311
}
285312
};
286313

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
'use strict';
2+
constcommon=require('../common');
3+
if(!common.hasCrypto)
4+
common.skip('missing crypto');
5+
6+
constassert=require('assert');
7+
consttls=require('tls');
8+
9+
// Array with empty string should throw (zero-length protocol entry)
10+
assert.throws(()=>{
11+
constout={};
12+
tls.convertALPNProtocols([''],out);
13+
},{
14+
code: 'ERR_INVALID_ARG_VALUE',
15+
});
16+
17+
// Array with empty string mixed
18+
assert.throws(()=>{
19+
constout={};
20+
tls.convertALPNProtocols(['h2',''],out);
21+
},{
22+
code: 'ERR_INVALID_ARG_VALUE',
23+
});
24+
25+
// Buffer wire format with leading zero length
26+
assert.throws(()=>{
27+
constout={};
28+
tls.convertALPNProtocols(Buffer.from([0]),out);
29+
},{
30+
code: 'ERR_INVALID_ARG_VALUE',
31+
});
32+
33+
// Buffer truncated (claims 2 bytes but only 1 follows)
34+
assert.throws(()=>{
35+
constout={};
36+
tls.convertALPNProtocols(Buffer.from([2,0x61]),out);
37+
},{
38+
code: 'ERR_INVALID_ARG_VALUE',
39+
});
40+
41+
// Buffer with trailing invalid byte
42+
assert.throws(()=>{
43+
constout={};
44+
tls.convertALPNProtocols(Buffer.from([1,0x61,0x62,0x62]),out);
45+
},{
46+
code: 'ERR_INVALID_ARG_VALUE',
47+
});
48+
49+
// Empty array means skip ALPN (allowed)
50+
{
51+
constout={};
52+
tls.convertALPNProtocols([],out);
53+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
54+
assert.strictEqual(out.ALPNProtocols.length,0);
55+
}
56+
57+
// Empty buffer means skip ALPN (allowed; same as [])
58+
{
59+
constout={};
60+
tls.convertALPNProtocols(Buffer.alloc(0),out);
61+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
62+
assert.strictEqual(out.ALPNProtocols.length,0);
63+
}
64+
65+
// Empty Uint8Array means skip ALPN
66+
{
67+
constout={};
68+
tls.convertALPNProtocols(newUint8Array(0),out);
69+
assert.ok(Buffer.isBuffer(out.ALPNProtocols));
70+
assert.strictEqual(out.ALPNProtocols.length,0);
71+
}
72+
73+
// Valid inputs should not throw
74+
{
75+
constout={};
76+
tls.convertALPNProtocols(['h2','http/1.1'],out);
77+
assert.ok(out.ALPNProtocols.length>0);
78+
}
79+
{
80+
constout={};
81+
tls.convertALPNProtocols(Buffer.from([
82+
2,0x61,0x62,8,0x68,0x74,0x74,0x70,0x2f,0x31,0x2e,0x31,
83+
]),out);
84+
assert.strictEqual(out.ALPNProtocols.length,12);
85+
}

‎test/parallel/test-tls-basic-validations.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,19 @@ assert.throws(() => tls.createServer({ ticketKeys: Buffer.alloc(0) }), {
8181
});
8282

8383
{
84-
constbuffer=Buffer.from('abcd');
84+
constbuffer=Buffer.from([3,0x61,0x62,0x63]);
8585
constout={};
8686
tls.convertALPNProtocols(buffer,out);
87-
out.ALPNProtocols.write('efgh');
88-
assert(buffer.equals(Buffer.from('abcd')));
89-
assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
87+
out.ALPNProtocols.write('def',1);
88+
assert(buffer.equals(Buffer.from([3,0x61,0x62,0x63])));
89+
assert(out.ALPNProtocols.equals(Buffer.from([3,0x64,0x65,0x66])));
9090
}
9191

9292
{
93-
constarrayBufferViewStr='abcd';
94-
constinputBuffer=Buffer.from(arrayBufferViewStr.repeat(8),'utf8');
93+
constinputBuffer=Buffer.concat([
94+
Buffer.from([31]),
95+
Buffer.alloc(31,0x61),
96+
]);
9597
for(constexpectViewofcommon.getArrayBufferViews(inputBuffer)){
9698
constout={};
9799
constexpected=Buffer.from(expectView.buffer.slice(),

0 commit comments

Comments
 (0)